diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 03:32:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 04:38:32 +0200 |
| commit | 16e25ef34b375dbc6789b6b0da7d077c1dcefe88 (patch) | |
| tree | cd2b27d2a0c185192c1202f0aaa7979c760ed6a1 /tests/fate | |
| parent | b0387edd5e766b1032f946d6cdb35b765bb45435 (diff) | |
| parent | c9cc76290f8139a012a12efe7e581276b8bd8dff (diff) | |
| download | ffmpeg-16e25ef34b375dbc6789b6b0da7d077c1dcefe88.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: extend -r to work on any input stream.
doc/avconv: expand documentation for the -s option.
avconv: don't print filters inserted by avconv in stream mappings.
avconv: merge configuration code for complex and simple filters
avconv: split configuring input filters out of configure_complex_filter
Conflicts:
configure
doc/ffmpeg.texi
ffmpeg.c
tests/ref/fate/idroq-video-encode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/mapchan.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak index 119f56613e..2a05f01e67 100644 --- a/tests/fate/mapchan.mak +++ b/tests/fate/mapchan.mak @@ -2,9 +2,9 @@ FATE_MAPCHAN += fate-mapchan-6ch-extract-2 fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav fate-mapchan-6ch-extract-2: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5: -FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono -fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav -fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav +#FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono +#fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav +#fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav FATE_MAPCHAN += fate-mapchan-silent-mono fate-mapchan-silent-mono: tests/data/asynth-22050-1.wav |