[FFmpeg-cvslog] segment: reverse pass avoid_negative_ts from the muxer

Michael Niedermayer git at videolan.org
Sat Oct 6 12:15:28 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  6 12:07:26 2012 +0200| [9d19d7c3352bea2da48aa94f4633e6e8313810a4] | committer: Michael Niedermayer

segment: reverse pass avoid_negative_ts from the muxer

This fixes failures with formats not supporting negative TS

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

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

 libavformat/segment.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 0284fac..b0f8a85 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -416,6 +416,9 @@ static int seg_write_header(AVFormatContext *s)
         goto fail;
     }
 
+    if (oc->avoid_negative_ts > 0 && s->avoid_negative_ts < 0)
+        s->avoid_negative_ts = 1;
+
     if (!seg->write_header_trailer) {
         close_null_ctx(oc->pb);
         if ((ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,



More information about the ffmpeg-cvslog mailing list