Commit d02b3e9b authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/utils: Provide context for av_log() where one is available

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8a91ee78
...@@ -1085,7 +1085,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, ...@@ -1085,7 +1085,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
pkt->pts > pkt->dts) pkt->pts > pkt->dts)
presentation_delayed = 1; 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", "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), presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts),
pkt->stream_index, pc, pkt->duration, delay, onein_oneout); pkt->stream_index, pc, pkt->duration, delay, onein_oneout);
...@@ -1151,7 +1151,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, ...@@ -1151,7 +1151,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
if (pkt->dts > st->cur_dts) if (pkt->dts > st->cur_dts)
st->cur_dts = pkt->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)); presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts));
/* update flags */ /* update flags */
...@@ -2986,7 +2986,7 @@ void ff_rfps_calculate(AVFormatContext *ic) ...@@ -2986,7 +2986,7 @@ void ff_rfps_calculate(AVFormatContext *ic)
num = get_std_framerate(j); num = get_std_framerate(j);
} }
if (error < 0.02) 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. // do not increase frame rate by more than 1 % in order to match a standard rate.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment