aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/segment.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-10-05 05:07:18 +0200
committerLuca Barbato <lu_zero@gentoo.org>2012-10-08 11:22:42 +0200
commit0826d8513d14f54da0b519360813327d5836b7fc (patch)
tree33b246cfee56e779dd23ea82cf14ecd3a2815eb3 /libavformat/segment.c
parent8728b958ff1b9b4b4a1d72b704af1decbe0bef31 (diff)
downloadffmpeg-0826d8513d14f54da0b519360813327d5836b7fc.tar.gz
segment: drop global headers setting
avconv provides an option to set it externally and there isn't a way for the outer demuxer to report the inner demuxer flag. Solves a bad interaction between mpegts and x264, but requires additional setting for the user.
Diffstat (limited to 'libavformat/segment.c')
-rw-r--r--libavformat/segment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 375df58396..8ac04e2f2e 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -319,7 +319,7 @@ AVOutputFormat ff_segment_muxer = {
.name = "segment",
.long_name = NULL_IF_CONFIG_SMALL("segment"),
.priv_data_size = sizeof(SegmentContext),
- .flags = AVFMT_GLOBALHEADER | AVFMT_NOFILE,
+ .flags = AVFMT_NOFILE,
.write_header = seg_write_header,
.write_packet = seg_write_packet,
.write_trailer = seg_write_trailer,