apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-02 05:23:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow passing subtitles header between decoder and encoder

Browse Source 
Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2010-11-13 13:57:49 +00:00
parent 2722dd6ebf
commit cb2c971d91
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/utils.c
View File

@@ -2206,9 +2206,14 @@ int av_find_stream_info(AVFormatContext *ic)
if (codec && codec->capabilities & CODEC_CAP_CHANNEL_CONF)
st->codec->channels = 0;
/* Ensure that subtitle_header is properly set. */
if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE
&& codec && !st->codec->codec)
avcodec_open(st->codec, codec);
//try to just open decoders, in case this is enough to get parameters
if(!has_codec_parameters(st->codec)){
if (codec)
if (codec && !st->codec->codec)
avcodec_open(st->codec, codec);
}
}
@@ -2471,6 +2476,7 @@ void av_close_input_stream(AVFormatContext *s)
av_metadata_free(&st->metadata);
av_free(st->index_entries);
av_free(st->codec->extradata);
av_free(st->codec->subtitle_header);
av_free(st->codec);
#if FF_API_OLD_METADATA
av_free(st->filename);