[FFmpeg-cvslog] segment: drop global headers setting

Luca Barbato git at videolan.org
Mon Oct 8 22:03:15 CEST 2012


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Oct  5 05:07:18 2012 +0200| [0826d8513d14f54da0b519360813327d5836b7fc] | committer: Luca Barbato

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.

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

 libavformat/segment.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 375df58..8ac04e2 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,



More information about the ffmpeg-cvslog mailing list