diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-12-04 14:46:13 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-12-04 14:46:13 +0000 |
| commit | 118ccae0307a5a2645ab1817158e36e9c0c80cf4 (patch) | |
| tree | c8c63c5d2bb3ccd187ad3d1e19ceb8197d5f0608 /libavformat/utils.c | |
| parent | 1c3b408f884dcd59f32be3fd49d23e91111e3109 (diff) | |
| download | ffmpeg-streaming-118ccae0307a5a2645ab1817158e36e9c0c80cf4.zip ffmpeg-streaming-118ccae0307a5a2645ab1817158e36e9c0c80cf4.tar.gz | |
add subtitle codec autodetection
Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 44d1c62..c8e6d66 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -274,6 +274,8 @@ enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, return codec_id; }else if(type == AVMEDIA_TYPE_AUDIO) return fmt->audio_codec; + else if (type == AVMEDIA_TYPE_SUBTITLE) + return fmt->subtitle_codec; else return CODEC_ID_NONE; } |
