[FFmpeg-cvslog] ffmpeg: do not set GLOBAL_HEADER flag in the options context

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Jul 12 16:18:45 2011 +0200| [8e2d08551655e7838688e0c01619592acbc91dfc] | committer: Anton Khirnov

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.

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

 ffmpeg.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index ccf9c62..61e6858 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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;