diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 20:43:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 20:57:39 +0200 |
| commit | 9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5 (patch) | |
| tree | df92b2b44496b4268d52c306974b92009b6f764e /tests | |
| parent | de1824e970d448a84bedce4936c301c322baa714 (diff) | |
| parent | ec2dbec84d94129207ed0f2a1151679fab305060 (diff) | |
| download | ffmpeg-9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: employ better names and add a convenient shorthand for vp6 tests
arm/neon: dsputil: use correct size specifiers on vld1/vst1
arm: dsputil: prettify some conditional instructions in put_pixels macros
vqavideo: change x/y loop counters to the usual pattern
avconv: use lrint() for rounding double timestamps
Conflicts:
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/vpx.mak | 22 | ||||
| -rw-r--r-- | tests/ref/fate/vp60 (renamed from tests/ref/fate/ea-vp60) | 0 | ||||
| -rw-r--r-- | tests/ref/fate/vp61 (renamed from tests/ref/fate/ea-vp61) | 0 |
3 files changed, 11 insertions, 11 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index e468735e21..c66eb4624e 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,12 +1,3 @@ -FATE_EA_VP6 += fate-ea-vp60 -fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 - -FATE_EA_VP6 += fate-ea-vp61 -fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 - -FATE_AVCONV += $(FATE_EA_VP6) -fate-ea-vp6: $(FATE_EA_VP6) - FATE_VP3 += fate-vp31 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi @@ -19,12 +10,21 @@ fate-vp3: $(FATE_VP3) FATE_AVCONV += fate-vp5 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an -FATE_AVCONV += fate-vp6a +FATE_VP6 += fate-vp60 +fate-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 + +FATE_VP6 += fate-vp61 +fate-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 + +FATE_VP6 += fate-vp6a fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv -FATE_AVCONV += fate-vp6f +FATE_VP6 += fate-vp6f fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv +FATE_AVCONV += $(FATE_VP6) +fate-vp6: $(FATE_VP6) + VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 define FATE_VP8_SUITE diff --git a/tests/ref/fate/ea-vp60 b/tests/ref/fate/vp60 index 5e4b62c60f..5e4b62c60f 100644 --- a/tests/ref/fate/ea-vp60 +++ b/tests/ref/fate/vp60 diff --git a/tests/ref/fate/ea-vp61 b/tests/ref/fate/vp61 index be1fe530bd..be1fe530bd 100644 --- a/tests/ref/fate/ea-vp61 +++ b/tests/ref/fate/vp61 |