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/video.mak | |
| parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
| parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
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/video.mak')
| -rw-r--r-- | tests/fate/video.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 9532d4f7f5..78049e58c1 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -66,12 +66,12 @@ fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial -fate-cvid-partial: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an - FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an +FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial +fate-cvid-partial: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an + FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale fate-cvid-grayscale: CMD = framecrc -i $(SAMPLES)/cvid/pcitva15.avi -an |