diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 15:15:02 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-17 15:52:48 +0100 |
| commit | db53b2b2c0f7b150d0363c4de0d0ca69c9c3c805 (patch) | |
| tree | 337c884cd1a0474c1cbd4ccd19dffd4447692b09 /ffmpeg_opt.c | |
| parent | c7a854af19019f57ed1fb0c2e65e9e0249b5a78c (diff) | |
| download | ffmpeg-db53b2b2c0f7b150d0363c4de0d0ca69c9c3c805.tar.gz | |
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
Fixes Ticket3470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 25bcf24d4d0faf0191923be8afac8f67ca98b500)
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index d154807bdf..4d3633fbed 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1728,7 +1728,7 @@ static int open_output_file(OptionsContext *o, const char *filename) /* subtitles: pick first */ MATCH_PER_TYPE_OPT(codec_names, str, subtitle_codec_name, oc, "s"); - if (!o->subtitle_disable && (oc->oformat->subtitle_codec != AV_CODEC_ID_NONE || subtitle_codec_name)) { + if (!o->subtitle_disable && (avcodec_find_encoder(oc->oformat->subtitle_codec) || subtitle_codec_name)) { for (i = 0; i < nb_input_streams; i++) if (input_streams[i]->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { new_subtitle_stream(o, oc, i); |