diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-27 15:34:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-27 15:42:55 +0200 |
| commit | fcd08262fdbd5ee4cc0d25d32e331d3f049ad8c2 (patch) | |
| tree | 139056d0ee0454662a437b89cab42872f9f46c0b /tests/fate | |
| parent | 2fd5e70869ccbcdbaa5183d4d763dc6c739b3494 (diff) | |
tests and tools: cleanup ffmpeg reference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/mapchan.mak | 2 | ||||
| -rw-r--r-- | tests/fate/pcm.mak | 2 | ||||
| -rw-r--r-- | tests/fate/vpx.mak | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak index 19c515c455..119f56613e 100644 --- a/tests/fate/mapchan.mak +++ b/tests/fate/mapchan.mak @@ -1,6 +1,6 @@ FATE_MAPCHAN += fate-mapchan-6ch-extract-2 fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav -fate-mapchan-6ch-extract-2: CMD = avconv -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-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 diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index c84de9e47f..e978719dd3 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -27,6 +27,6 @@ fate-dcinema-encode: tests/data/asynth-96000-6.wav fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud -FATE_AVCONV += $(FATE_PCM) +FATE_FFMPEG += $(FATE_PCM) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM) fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 8168fb2b4a..d3f9cc79ae 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -37,7 +37,7 @@ define FATE_VP8_FULL $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) # FIXME this file contains two frames with identical timestamps, -# so avconv drops one of them +# so ffmpeg drops one of them FATE_VP8 += fate-vp8-sign-bias$(1) fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias |