summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-06 12:07:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-06 12:07:26 +0200
commit9d19d7c3352bea2da48aa94f4633e6e8313810a4 (patch)
tree17d8984b7954bb590b3d65d8399f8acaa6dec94b
parent2c34367b4a17856584b3e8b64cefa1900342ebcd (diff)
segment: reverse pass avoid_negative_ts from the muxer
This fixes failures with formats not supporting negative TS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/segment.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 0284fac51e..b0f8a856fe 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,