aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-11-13 13:46:36 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-11-13 13:46:36 +0000
commit8f55616fac485ae991019d0d1db13b6ff950fd1a (patch)
tree1c697e7769a9c30f8781dc8206ba3758e49f9105 /ffmpeg.c
parent47c5e4145c4ed3934f5df48ba6377d0d5d1c860b (diff)
downloadffmpeg-8f55616fac485ae991019d0d1db13b6ff950fd1a.tar.gz
add global header support for subtitles encoding
Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index dcad55a074..017679ca8a 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 {