[FFmpeg-cvslog] ffmpeg: set correct log context for non monotone dts workaround warnings

Michael Niedermayer git at videolan.org
Fri May 3 15:12:00 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 15:03:35 2013 +0200| [af2d96433624d4083bd94083a2ef8aaa5f42c3a2] | committer: Michael Niedermayer

ffmpeg: set correct log context for non monotone dts workaround warnings

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af2d96433624d4083bd94083a2ef8aaa5f42c3a2
---

 ffmpeg.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 6017691..ea5c581 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -617,14 +617,14 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
       int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
       if (pkt->dts < max) {
         int loglevel = max - pkt->dts > 2 || avctx->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG;
-        av_log(NULL, loglevel, "Non-monotonous DTS in output stream "
+        av_log(s, loglevel, "Non-monotonous DTS in output stream "
                "%d:%d; previous: %"PRId64", current: %"PRId64"; ",
                ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts);
         if (exit_on_error) {
             av_log(NULL, AV_LOG_FATAL, "aborting.\n");
             exit(1);
         }
-        av_log(NULL, loglevel, "changing to %"PRId64". This may result "
+        av_log(s, loglevel, "changing to %"PRId64". This may result "
                "in incorrect timestamps in the output file.\n",
                max);
         if(pkt->pts >= pkt->dts)



More information about the ffmpeg-cvslog mailing list