aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-06 00:49:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-06 00:49:23 +0200
commitd543b3bb5260df543e11b5a3f05767625b8a250e (patch)
treefb10f377cadaf2399db5351aa17505dec4a636fc
parent845383c358a8c5d8e24e43f6743ec435d2dd3f42 (diff)
downloadffmpeg-d543b3bb5260df543e11b5a3f05767625b8a250e.tar.gz
ffmpeg: map subtitle stream by default when user specified -scodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 129501ba18..b29089bc60 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);