OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5463e83
)
avconv: make negative mappings disable only streams from the specified file
author
Anton Khirnov
<anton@khirnov.net>
Sat, 29 Oct 2011 05:58:23 +0000
(07:58 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Thu, 3 Nov 2011 06:28:08 +0000
(07:28 +0100)
avconv.c
patch
|
blob
|
history
diff --git
a/avconv.c
b/avconv.c
index
e3b4e80
..
e59786f
100644
(file)
--- 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;