summaryrefslogtreecommitdiff
path: root/tests/ref
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-11 20:43:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-11 20:57:39 +0200
commit9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5 (patch)
treedf92b2b44496b4268d52c306974b92009b6f764e /tests/ref
parentde1824e970d448a84bedce4936c301c322baa714 (diff)
parentec2dbec84d94129207ed0f2a1151679fab305060 (diff)
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/ref')
-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
2 files changed, 0 insertions, 0 deletions
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