projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47c5e41
)
add global header support for subtitles encoding
author
Aurelien Jacobs
<aurel@gnuage.org>
Sat, 13 Nov 2010 13:46:36 +0000
(13:46 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Sat, 13 Nov 2010 13:46:36 +0000
(13:46 +0000)
Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
dcad55a
..
017679c
100644
(file)
--- 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 {