[FFmpeg-cvslog] ffmpeg: map subtitle stream by default when user specified -scodec

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  6 00:49:23 2011 +0200| [d543b3bb5260df543e11b5a3f05767625b8a250e] | committer: Michael Niedermayer

ffmpeg: map subtitle stream by default when user specified -scodec

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d543b3bb5260df543e11b5a3f05767625b8a250e
---

 ffmpeg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 129501b..b29089b 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);