diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
| commit | 841a288cb32785400261cbab959fcfb982d3f699 (patch) | |
| tree | 5cdac1ec2a527409495aadfb6d9142b89b398d8b /tests/fate/vpx.mak | |
| parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
| parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
| download | ffmpeg-841a288cb32785400261cbab959fcfb982d3f699.tar.gz | |
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
fate: cosmetics: Order some test entries
Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vpx.mak')
| -rw-r--r-- | tests/fate/vpx.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index fd9c905b4e..1c57ed8b02 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,9 +1,9 @@ -FATE_VP3-$(CONFIG_AVI_DEMUXER) += fate-vp31 -fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi - FATE_VP3-$(CONFIG_MATROSKA_DEMUXER) += fate-vp3-coeff-level64 fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv +FATE_VP3-$(CONFIG_AVI_DEMUXER) += fate-vp31 +fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi + FATE_SAMPLES_AVCONV-$(CONFIG_VP3_DECODER) += $(FATE_VP3-yes) fate-vp3: $(FATE_VP3-yes) |