aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-06 21:59:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-06 21:59:50 +0200
commit481747c6f74c7e17fcefc9341533f90b6fc8cd5b (patch)
tree3bd7d95e33606e49bf77468a8683eeb916399286 /ffmpeg.c
parentf7fbbf466f5c923e366b03d78bae0f4f64f013fa (diff)
downloadffmpeg-481747c6f74c7e17fcefc9341533f90b6fc8cd5b.tar.gz
ffmpeg: make -a/v/sn work with -map
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 43d8b771c8..e9133ec611 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3648,6 +3648,13 @@ static void opt_output_file(void *optctx, const char *filename)
continue;
ist = &input_streams[input_files[map->file_index].ist_index + map->stream_index];
+ if(o->subtitle_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
+ continue;
+ if(o-> audio_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ continue;
+ if(o-> video_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ continue;
+
switch (ist->st->codec->codec_type) {
case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc); break;
case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc); break;