ffmpeg | branch: master | Anton Khirnov <[email protected]> | Thu Dec 14 08:20:13 2023 +0100| [8a11724a0283a854896a0f9e551318211c038537] | committer: Anton Khirnov
fftools/ffmpeg_mux: stop logging to AVFormatContext Only the muxer itself is supposed to do that. Log to OutputStream instead. Drop now-redundant information from the logged string. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a11724a0283a854896a0f9e551318211c038537 --- fftools/ffmpeg_mux.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 8e523dd49d..74df6dcb64 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -176,9 +176,8 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) if (pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->dts > pkt->pts) { - av_log(s, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64" in output stream %d:%d, replacing by guess\n", - pkt->dts, pkt->pts, - mux->of.index, ost->st->index); + av_log(ost, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64", replacing by guess\n", + pkt->dts, pkt->pts); pkt->pts = pkt->dts = pkt->pts + pkt->dts + ms->last_mux_dts + 1 - FFMIN3(pkt->pts, pkt->dts, ms->last_mux_dts + 1) @@ -192,15 +191,15 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) int loglevel = max - pkt->dts > 2 || ost->type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; if (exit_on_error) loglevel = AV_LOG_ERROR; - av_log(s, loglevel, "Non-monotonic DTS in output stream " - "%d:%d; previous: %"PRId64", current: %"PRId64"; ", - mux->of.index, ost->st->index, ms->last_mux_dts, pkt->dts); + av_log(ost, loglevel, "Non-monotonic DTS; " + "previous: %"PRId64", current: %"PRId64"; ", + ms->last_mux_dts, pkt->dts); if (exit_on_error) { ret = AVERROR(EINVAL); goto fail; } - av_log(s, loglevel, "changing to %"PRId64". This may result " + av_log(ost, loglevel, "changing to %"PRId64". This may result " "in incorrect timestamps in the output file.\n", max); if (pkt->pts >= pkt->dts) _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
