* 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
Showing the changes to libavdevice/fbdev_dec.c (1 of 39 files). Show all
Unified · Split
| @@ -163,7 +163,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) · 162 unmodified lines | ||
| 163 | 163 | while (1) { |
| 164 | 164 | curtime = av_gettime(); |
| 165 | 165 | delay = fbdev->time_frame - curtime; |
| 166 | − av_dlog(avctx, | |
| 166 | + av_log(avctx, AV_LOG_TRACE, | |
| 167 | 167 | "time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n", |
| 168 | 168 | fbdev->time_frame, curtime, delay); |
| 169 | 169 | if (delay <= 0) { |