Re: [libav-devel] [PATCH 2/2] segment: drop global headers setting

2012-10-07 Thread Luca Barbato
On 10/05/2012 05:14 AM, Luca Barbato wrote:
> 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.
> ---
>  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,
> 

Approved on irc by Martin.
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


[libav-devel] [PATCH 2/2] segment: drop global headers setting

2012-10-04 Thread Luca Barbato
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.
---
 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,
-- 
1.7.12

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel