ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Apr 20 16:23:43 2015 +0200| [d02b3e9bdbd7d46d7cd4e084d5831f4ec7028155] | committer: Michael Niedermayer
avformat/utils: Provide context for av_log() where one is available Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d02b3e9bdbd7d46d7cd4e084d5831f4ec7028155 --- libavformat/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d7f6e87..16e5976 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1085,7 +1085,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, pkt->pts > pkt->dts) presentation_delayed = 1; - av_log(NULL, AV_LOG_TRACE, + av_log(s, AV_LOG_TRACE, "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%d delay:%d onein_oneout:%d\n", presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), pkt->stream_index, pc, pkt->duration, delay, onein_oneout); @@ -1151,7 +1151,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (pkt->dts > st->cur_dts) st->cur_dts = pkt->dts; - av_log(NULL, AV_LOG_TRACE, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n", + av_log(s, AV_LOG_TRACE, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n", presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts)); /* update flags */ @@ -2986,7 +2986,7 @@ void ff_rfps_calculate(AVFormatContext *ic) num = get_std_framerate(j); } if (error < 0.02) - av_log(NULL, AV_LOG_DEBUG, "rfps: %f %f\n", get_std_framerate(j) / 12.0/1001, error); + av_log(ic, AV_LOG_DEBUG, "rfps: %f %f\n", get_std_framerate(j) / 12.0/1001, error); } } // do not increase frame rate by more than 1 % in order to match a standard rate. _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
