From d3bb022bf12b60034859f51c1a1e952cc5cfd32e Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 4 Nov 2014 00:15:54 -0800
Subject: [PATCH] Video: Fix setting global extradata in FFmpeg

---
 src/platform/ffmpeg/ffmpeg-encoder.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/platform/ffmpeg/ffmpeg-encoder.c b/src/platform/ffmpeg/ffmpeg-encoder.c
index 087d0b9fe..a016fa3dd 100644
--- a/src/platform/ffmpeg/ffmpeg-encoder.c
+++ b/src/platform/ffmpeg/ffmpeg-encoder.c
@@ -184,6 +184,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
 	encoder->audio->sample_fmt = encoder->sampleFormat;
 	AVDictionary* opts = 0;
 	av_dict_set(&opts, "strict", "-2", 0);
+	if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) {
+		encoder->audio->flags |= CODEC_FLAG_GLOBAL_HEADER;
+	}
 	avcodec_open2(encoder->audio, acodec, &opts);
 	av_dict_free(&opts);
 	encoder->audioFrame = av_frame_alloc();
@@ -221,6 +224,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
 	encoder->video->pix_fmt = encoder->pixFormat;
 	encoder->video->gop_size = 15;
 	encoder->video->max_b_frames = 0;
+	if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) {
+		encoder->video->flags |= CODEC_FLAG_GLOBAL_HEADER;
+	}
 	avcodec_open2(encoder->video, vcodec, 0);
 	encoder->videoFrame = av_frame_alloc();
 	encoder->videoFrame->format = encoder->video->pix_fmt;
@@ -232,11 +238,6 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
 		0, 0, 0, 0);
 	av_image_alloc(encoder->videoFrame->data, encoder->videoFrame->linesize, encoder->video->width, encoder->video->height, encoder->video->pix_fmt, 32);
 
-	if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) {
-		encoder->audio->flags |= CODEC_FLAG_GLOBAL_HEADER;
-		encoder->video->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	}
-
 	avio_open(&encoder->context->pb, outfile, AVIO_FLAG_WRITE);
 	avformat_write_header(encoder->context, 0);