[FFmpeg-cvslog] ffmpeg: make -a/v/sn work with -map

Michael Niedermayer git at videolan.org
Thu Oct 6 23:13:40 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  6 21:59:50 2011 +0200| [481747c6f74c7e17fcefc9341533f90b6fc8cd5b] | committer: Michael Niedermayer

ffmpeg: make -a/v/sn work with -map

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

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 43d8b77..e9133ec 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;



More information about the ffmpeg-cvslog mailing list