diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:19:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:19:47 +0200 |
| commit | 40d552dae657d2d690a724c8b1e7ea714998d74f (patch) | |
| tree | 43534ea3562526771f95b821b9e8cbbd7573d24e /libavdevice | |
| parent | 8e8219e0f0725116809cdd1c17c868cb08da0dec (diff) | |
| parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) | |
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/dv1394.c | 4 | ||||
| -rw-r--r-- | libavdevice/fbdev_dec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 833b65d0d0..9f02780e72 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -160,7 +160,7 @@ restart_poll: av_log(context, AV_LOG_ERROR, "Failed to get status: %s\n", strerror(errno)); return AVERROR(EIO); } - av_dlog(context, "DV1394: status\n" + av_log(context, AV_LOG_TRACE, "DV1394: status\n" "\tactive_frame\t%d\n" "\tfirst_clear_frame\t%d\n" "\tn_clear_frames\t%d\n" @@ -181,7 +181,7 @@ restart_poll: } } - av_dlog(context, "index %d, avail %d, done %d\n", dv->index, dv->avail, + av_log(context, AV_LOG_TRACE, "index %d, avail %d, done %d\n", dv->index, dv->avail, dv->done); size = avpriv_dv_produce_packet(dv->dv_demux, pkt, diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index f56408c3d4..c1e946a564 100644 --- a/libavdevice/fbdev_dec.c +++ b/libavdevice/fbdev_dec.c @@ -163,7 +163,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) while (1) { curtime = av_gettime(); delay = fbdev->time_frame - curtime; - av_dlog(avctx, + av_log(avctx, AV_LOG_TRACE, "time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n", fbdev->time_frame, curtime, delay); if (delay <= 0) { |