From d543b3bb5260df543e11b5a3f05767625b8a250e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 6 Sep 2011 00:49:23 +0200
Subject: [PATCH] ffmpeg: map subtitle stream by default when user specified
-scodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 129501ba18c..b29089bc60b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3723,7 +3723,7 @@ static void opt_output_file(void *optctx, const char *filename)
}
/* subtitles: pick first */
- if (!subtitle_disable && oc->oformat->subtitle_codec != CODEC_ID_NONE) {
+ if (!subtitle_disable && (oc->oformat->subtitle_codec != CODEC_ID_NONE || subtitle_codec_name)) {
for (i = 0; i < nb_input_streams; i++)
if (input_streams[i].st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
NEW_STREAM(subtitle, i);
--
GitLab