diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-07-12 16:18:45 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-07-13 23:17:42 +0200 |
commit | 8e2d08551655e7838688e0c01619592acbc91dfc (patch) | |
tree | eb646afb6f2e3a9e6ea62fcdebf5efec94295e1d | |
parent | b5849f77095439e994b11c25e6063d443b36c228 (diff) | |
download | ffmpeg-8e2d08551655e7838688e0c01619592acbc91dfc.tar.gz |
ffmpeg: do not set GLOBAL_HEADER flag in the options context
The removed lines have no effect, since the flag is set on all encoder
for the given file and avcodec_opts are reset between files.
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -3463,7 +3463,6 @@ static void new_video_stream(AVFormatContext *oc, int file_idx) if(oc->oformat->flags & AVFMT_GLOBALHEADER) { video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - avcodec_opts[AVMEDIA_TYPE_VIDEO]->flags|= CODEC_FLAG_GLOBAL_HEADER; } if (video_stream_copy) { @@ -3589,7 +3588,6 @@ static void new_audio_stream(AVFormatContext *oc, int file_idx) if (oc->oformat->flags & AVFMT_GLOBALHEADER) { audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - avcodec_opts[AVMEDIA_TYPE_AUDIO]->flags|= CODEC_FLAG_GLOBAL_HEADER; } if (audio_stream_copy) { st->stream_copy = 1; @@ -3640,7 +3638,6 @@ static void new_data_stream(AVFormatContext *oc, int file_idx) if (oc->oformat->flags & AVFMT_GLOBALHEADER) { data_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - avcodec_opts[AVMEDIA_TYPE_DATA]->flags |= CODEC_FLAG_GLOBAL_HEADER; } if (data_stream_copy) { st->stream_copy = 1; @@ -3683,7 +3680,6 @@ static void new_subtitle_stream(AVFormatContext *oc, int file_idx) if (oc->oformat->flags & AVFMT_GLOBALHEADER) { subtitle_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - avcodec_opts[AVMEDIA_TYPE_SUBTITLE]->flags |= CODEC_FLAG_GLOBAL_HEADER; } if (subtitle_stream_copy) { st->stream_copy = 1; |