[FFmpeg-cvslog] avconv: make negative mappings disable only streams from the specified file

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Oct 29 07:58:23 2011 +0200| [e6674f685b1dae4088a4ca8c2249956c96898661] | committer: Anton Khirnov

avconv: make negative mappings disable only streams from the specified file

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

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

diff --git a/avconv.c b/avconv.c
index e3b4e80..e59786f 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2638,7 +2638,8 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
         /* disable some already defined maps */
         for (i = 0; i < o->nb_stream_maps; i++) {
             m = &o->stream_maps[i];
-            if (check_stream_specifier(input_files[m->file_index].ctx,
+            if (file_idx == m->file_index &&
+                check_stream_specifier(input_files[m->file_index].ctx,
                                        input_files[m->file_index].ctx->streams[m->stream_index],
                                        *p == ':' ? p + 1 : p) > 0)
                 m->disabled = 1;