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.

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.
8e2d0855 · Anton Khirnov · b5849f77 · 8e2d0855
Commit 8e2d0855 authored Jul 12, 2011 by Anton Khirnov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

ffmpeg.c ffmpeg.c +0 -4

No files found.
--- 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;