aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-10-29 07:58:23 +0200
committerAnton Khirnov <anton@khirnov.net>2011-11-03 07:28:08 +0100
commite6674f685b1dae4088a4ca8c2249956c96898661 (patch)
tree0098a8a1563e3fe4f9d93375d5a3aa724eb02caf
parent5463e83dbc9825f3962118f0d3328be82aea3308 (diff)
downloadffmpeg-e6674f685b1dae4088a4ca8c2249956c96898661.tar.gz
avconv: make negative mappings disable only streams from the specified file
-rw-r--r--avconv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index e3b4e80c3f..e59786f199 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;