From 48609236daf85d1974c4a23d22e6eb63d5132c3e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 16 Mar 2014 15:15:02 +0100 Subject: [PATCH] ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams Fixes Ticket3470 Signed-off-by: Michael Niedermayer (cherry picked from commit 25bcf24d4d0faf0191923be8afac8f67ca98b500) --- ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 7bd0817c29..ba2df02e47 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1821,7 +1821,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);