[SCM] libav/experimental: add global header support for subtitles encoding

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8f55616fac485ae991019d0d1db13b6ff950fd1a
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Sat Nov 13 13:46:36 2010 +0000

    add global header support for subtitles encoding
    
    Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index dcad55a..017679c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3577,6 +3577,10 @@ static void new_subtitle_stream(AVFormatContext *oc, int file_idx)
     if(subtitle_codec_tag)
         subtitle_enc->codec_tag= subtitle_codec_tag;
 
+    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;
     } else {

-- 
Libav/FFmpeg packaging