aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-02 21:41:52 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-02 21:41:52 +0000
commitcc3e2472f31edc2ef3ee685e82f6cd924ed84d7e (patch)
tree0ea2ae971e16502ba873d5cc943c8ac0f6f6ed72 /tests/ref
parent5eef7bcd09ab1f73df6c70923dfa3f4ccd5b4190 (diff)
downloadffmpeg-cc3e2472f31edc2ef3ee685e82f6cd924ed84d7e.tar.gz
Place regression test output files in subdirs per family
Originally committed as revision 22155 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests/ref')
-rw-r--r--tests/ref/acodec/ac34
-rw-r--r--tests/ref/acodec/adpcm_ima_qt4
-rw-r--r--tests/ref/acodec/adpcm_ima_wav4
-rw-r--r--tests/ref/acodec/adpcm_ms4
-rw-r--r--tests/ref/acodec/adpcm_swf4
-rw-r--r--tests/ref/acodec/adpcm_yam4
-rw-r--r--tests/ref/acodec/alac4
-rw-r--r--tests/ref/acodec/flac4
-rw-r--r--tests/ref/acodec/g7264
-rw-r--r--tests/ref/acodec/mp24
-rw-r--r--tests/ref/acodec/pcm72
-rw-r--r--tests/ref/acodec/wmav14
-rw-r--r--tests/ref/acodec/wmav24
-rw-r--r--tests/ref/lavf/aiff6
-rw-r--r--tests/ref/lavf/alaw6
-rw-r--r--tests/ref/lavf/asf6
-rw-r--r--tests/ref/lavf/au6
-rw-r--r--tests/ref/lavf/avi6
-rw-r--r--tests/ref/lavf/bmp6
-rw-r--r--tests/ref/lavf/dv_fmt6
-rw-r--r--tests/ref/lavf/ffm6
-rw-r--r--tests/ref/lavf/flv_fmt6
-rw-r--r--tests/ref/lavf/gif4
-rw-r--r--tests/ref/lavf/gxf6
-rw-r--r--tests/ref/lavf/jpg6
-rw-r--r--tests/ref/lavf/mkv6
-rw-r--r--tests/ref/lavf/mmf6
-rw-r--r--tests/ref/lavf/mov6
-rw-r--r--tests/ref/lavf/mpg6
-rw-r--r--tests/ref/lavf/mulaw6
-rw-r--r--tests/ref/lavf/mxf12
-rw-r--r--tests/ref/lavf/nut6
-rw-r--r--tests/ref/lavf/ogg6
-rw-r--r--tests/ref/lavf/pbmpipe6
-rw-r--r--tests/ref/lavf/pcx6
-rw-r--r--tests/ref/lavf/pgm6
-rw-r--r--tests/ref/lavf/pgmpipe6
-rw-r--r--tests/ref/lavf/pixfmt76
-rw-r--r--tests/ref/lavf/ppm6
-rw-r--r--tests/ref/lavf/ppmpipe6
-rw-r--r--tests/ref/lavf/rm4
-rw-r--r--tests/ref/lavf/sgi6
-rw-r--r--tests/ref/lavf/swf6
-rw-r--r--tests/ref/lavf/tga6
-rw-r--r--tests/ref/lavf/tiff6
-rw-r--r--tests/ref/lavf/ts6
-rw-r--r--tests/ref/lavf/voc6
-rw-r--r--tests/ref/lavf/wav6
-rw-r--r--tests/ref/lavf/yuv4mpeg4
-rw-r--r--tests/ref/vsynth1/asv14
-rw-r--r--tests/ref/vsynth1/asv24
-rw-r--r--tests/ref/vsynth1/dnxhd_1080i4
-rw-r--r--tests/ref/vsynth1/dnxhd_720p4
-rw-r--r--tests/ref/vsynth1/dnxhd_720p_rd4
-rw-r--r--tests/ref/vsynth1/dv8
-rw-r--r--tests/ref/vsynth1/dv504
-rw-r--r--tests/ref/vsynth1/error4
-rw-r--r--tests/ref/vsynth1/ffv14
-rw-r--r--tests/ref/vsynth1/flashsv4
-rw-r--r--tests/ref/vsynth1/flv4
-rw-r--r--tests/ref/vsynth1/h2614
-rw-r--r--tests/ref/vsynth1/h2634
-rw-r--r--tests/ref/vsynth1/h263p4
-rw-r--r--tests/ref/vsynth1/huffyuv4
-rw-r--r--tests/ref/vsynth1/jpegls4
-rw-r--r--tests/ref/vsynth1/ljpeg4
-rw-r--r--tests/ref/vsynth1/mjpeg4
-rw-r--r--tests/ref/vsynth1/mpeg4
-rw-r--r--tests/ref/vsynth1/mpeg1b4
-rw-r--r--tests/ref/vsynth1/mpeg220
-rw-r--r--tests/ref/vsynth1/mpeg2thread12
-rw-r--r--tests/ref/vsynth1/mpeg44
-rw-r--r--tests/ref/vsynth1/mpeg4adv16
-rw-r--r--tests/ref/vsynth1/mpeg4nr4
-rw-r--r--tests/ref/vsynth1/mpeg4thread4
-rw-r--r--tests/ref/vsynth1/msmpeg44
-rw-r--r--tests/ref/vsynth1/msmpeg4v24
-rw-r--r--tests/ref/vsynth1/rc4
-rw-r--r--tests/ref/vsynth1/roq4
-rw-r--r--tests/ref/vsynth1/rv104
-rw-r--r--tests/ref/vsynth1/rv204
-rw-r--r--tests/ref/vsynth1/snow4
-rw-r--r--tests/ref/vsynth1/snowll4
-rw-r--r--tests/ref/vsynth1/svq14
-rw-r--r--tests/ref/vsynth1/wmv14
-rw-r--r--tests/ref/vsynth1/wmv24
-rw-r--r--tests/ref/vsynth2/asv14
-rw-r--r--tests/ref/vsynth2/asv24
-rw-r--r--tests/ref/vsynth2/dnxhd_1080i4
-rw-r--r--tests/ref/vsynth2/dnxhd_720p4
-rw-r--r--tests/ref/vsynth2/dnxhd_720p_rd4
-rw-r--r--tests/ref/vsynth2/dv8
-rw-r--r--tests/ref/vsynth2/dv504
-rw-r--r--tests/ref/vsynth2/error4
-rw-r--r--tests/ref/vsynth2/ffv14
-rw-r--r--tests/ref/vsynth2/flashsv4
-rw-r--r--tests/ref/vsynth2/flv4
-rw-r--r--tests/ref/vsynth2/h2614
-rw-r--r--tests/ref/vsynth2/h2634
-rw-r--r--tests/ref/vsynth2/h263p4
-rw-r--r--tests/ref/vsynth2/huffyuv4
-rw-r--r--tests/ref/vsynth2/jpegls4
-rw-r--r--tests/ref/vsynth2/ljpeg4
-rw-r--r--tests/ref/vsynth2/mjpeg4
-rw-r--r--tests/ref/vsynth2/mpeg4
-rw-r--r--tests/ref/vsynth2/mpeg1b4
-rw-r--r--tests/ref/vsynth2/mpeg220
-rw-r--r--tests/ref/vsynth2/mpeg2thread12
-rw-r--r--tests/ref/vsynth2/mpeg44
-rw-r--r--tests/ref/vsynth2/mpeg4adv16
-rw-r--r--tests/ref/vsynth2/mpeg4nr4
-rw-r--r--tests/ref/vsynth2/mpeg4thread4
-rw-r--r--tests/ref/vsynth2/msmpeg44
-rw-r--r--tests/ref/vsynth2/msmpeg4v24
-rw-r--r--tests/ref/vsynth2/rc4
-rw-r--r--tests/ref/vsynth2/roq4
-rw-r--r--tests/ref/vsynth2/rv104
-rw-r--r--tests/ref/vsynth2/rv204
-rw-r--r--tests/ref/vsynth2/snow4
-rw-r--r--tests/ref/vsynth2/snowll4
-rw-r--r--tests/ref/vsynth2/svq14
-rw-r--r--tests/ref/vsynth2/wmv14
-rw-r--r--tests/ref/vsynth2/wmv24
123 files changed, 391 insertions, 391 deletions
diff --git a/tests/ref/acodec/ac3 b/tests/ref/acodec/ac3
index 8198602652..b39395637c 100644
--- a/tests/ref/acodec/ac3
+++ b/tests/ref/acodec/ac3
@@ -1,2 +1,2 @@
-081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/a-ac3.rm
-98751 ./tests/data/a-ac3.rm
+081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/acodec/ac3.rm
+98751 ./tests/data/acodec/ac3.rm
diff --git a/tests/ref/acodec/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt
index 76a244c571..4fef154823 100644
--- a/tests/ref/acodec/adpcm_ima_qt
+++ b/tests/ref/acodec/adpcm_ima_qt
@@ -1,4 +1,4 @@
-3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
-281252 ./tests/data/a-adpcm_qt.aiff
+3c06fd2f7831e3e8735b936e23ca220c *./tests/data/acodec/adpcm_qt.aiff
+281252 ./tests/data/acodec/adpcm_qt.aiff
9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.acodec.out.wav
stddev: 914.63 PSNR: 37.10 bytes: 1058604/ 1058444
diff --git a/tests/ref/acodec/adpcm_ima_wav b/tests/ref/acodec/adpcm_ima_wav
index c4f4b8d541..a58c279881 100644
--- a/tests/ref/acodec/adpcm_ima_wav
+++ b/tests/ref/acodec/adpcm_ima_wav
@@ -1,4 +1,4 @@
-56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
-267324 ./tests/data/a-adpcm_ima.wav
+56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/acodec/adpcm_ima.wav
+267324 ./tests/data/acodec/adpcm_ima.wav
78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.acodec.out.wav
stddev: 903.51 PSNR: 37.21 bytes: 1061792/ 1058444
diff --git a/tests/ref/acodec/adpcm_ms b/tests/ref/acodec/adpcm_ms
index cb50f0ac60..99a7105fcb 100644
--- a/tests/ref/acodec/adpcm_ms
+++ b/tests/ref/acodec/adpcm_ms
@@ -1,4 +1,4 @@
-a407b87daeef5b25dfb6c5b3f519e9c1 *./tests/data/a-adpcm_ms.wav
-268378 ./tests/data/a-adpcm_ms.wav
+a407b87daeef5b25dfb6c5b3f519e9c1 *./tests/data/acodec/adpcm_ms.wav
+268378 ./tests/data/acodec/adpcm_ms.wav
7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.acodec.out.wav
stddev: 1050.00 PSNR: 35.91 bytes: 1060620/ 1058444
diff --git a/tests/ref/acodec/adpcm_swf b/tests/ref/acodec/adpcm_swf
index ffce37c529..59bf8f3a4b 100644
--- a/tests/ref/acodec/adpcm_swf
+++ b/tests/ref/acodec/adpcm_swf
@@ -1,4 +1,4 @@
-42d4639866ed4d692eaf126228a4fa2a *./tests/data/a-adpcm_swf.flv
-269166 ./tests/data/a-adpcm_swf.flv
+42d4639866ed4d692eaf126228a4fa2a *./tests/data/acodec/adpcm_swf.flv
+269166 ./tests/data/acodec/adpcm_swf.flv
628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.acodec.out.wav
stddev: 933.65 PSNR: 36.93 bytes: 1065004/ 1058444
diff --git a/tests/ref/acodec/adpcm_yam b/tests/ref/acodec/adpcm_yam
index 166b9b49b0..9889dd90db 100644
--- a/tests/ref/acodec/adpcm_yam
+++ b/tests/ref/acodec/adpcm_yam
@@ -1,4 +1,4 @@
-2546d72df736b5ffa1557e8c9c9ef788 *./tests/data/a-adpcm_yam.wav
-266296 ./tests/data/a-adpcm_yam.wav
+2546d72df736b5ffa1557e8c9c9ef788 *./tests/data/acodec/adpcm_yam.wav
+266296 ./tests/data/acodec/adpcm_yam.wav
c80c847a53a0fee17a88fa889ec34a4e *./tests/data/adpcm_yam.acodec.out.wav
stddev: 1247.64 PSNR: 34.41 bytes: 1065004/ 1058444
diff --git a/tests/ref/acodec/alac b/tests/ref/acodec/alac
index b9b8955e29..143b1f3cd6 100644
--- a/tests/ref/acodec/alac
+++ b/tests/ref/acodec/alac
@@ -1,4 +1,4 @@
-c68f649777ab8e7c9a0f1f221451d3ad *./tests/data/a-alac.m4a
-389386 ./tests/data/a-alac.m4a
+c68f649777ab8e7c9a0f1f221451d3ad *./tests/data/acodec/alac.m4a
+389386 ./tests/data/acodec/alac.m4a
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/alac.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
diff --git a/tests/ref/acodec/flac b/tests/ref/acodec/flac
index 2a1982a436..ef7d394cb1 100644
--- a/tests/ref/acodec/flac
+++ b/tests/ref/acodec/flac
@@ -1,4 +1,4 @@
-7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
-353368 ./tests/data/a-flac.flac
+7781a016edfc242a39e4d65af02d861a *./tests/data/acodec/flac.flac
+353368 ./tests/data/acodec/flac.flac
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
diff --git a/tests/ref/acodec/g726 b/tests/ref/acodec/g726
index a57cd36a65..02b9eea651 100644
--- a/tests/ref/acodec/g726
+++ b/tests/ref/acodec/g726
@@ -1,4 +1,4 @@
-5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
-24082 ./tests/data/a-g726.wav
+5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/acodec/g726.wav
+24082 ./tests/data/acodec/g726.wav
4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.acodec.out.wav
stddev: 8506.46 PSNR: 17.73 bytes: 96148/ 1058444
diff --git a/tests/ref/acodec/mp2 b/tests/ref/acodec/mp2
index 5974aab047..0607caba1e 100644
--- a/tests/ref/acodec/mp2
+++ b/tests/ref/acodec/mp2
@@ -1,5 +1,5 @@
-f6eb0a205350bbd7fb1028a01c7ae8aa *./tests/data/a-mp2.mp2
-96130 ./tests/data/a-mp2.mp2
+f6eb0a205350bbd7fb1028a01c7ae8aa *./tests/data/acodec/mp2.mp2
+96130 ./tests/data/acodec/mp2.mp2
74c7b6b15a001add199619fafe4059a1 *./tests/data/mp2.acodec.out.wav
stddev: 9315.80 PSNR: 16.94 bytes: 1059884/ 1058444
stddev: 4385.25 PSNR: 23.49 bytes: 1057960/ 1058444
diff --git a/tests/ref/acodec/pcm b/tests/ref/acodec/pcm
index 376de0ab79..6c826dd1ba 100644
--- a/tests/ref/acodec/pcm
+++ b/tests/ref/acodec/pcm
@@ -1,72 +1,72 @@
-89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
-529256 ./tests/data/a-pcm_alaw.wav
+89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/acodec/pcm_alaw.wav
+529256 ./tests/data/acodec/pcm_alaw.wav
0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.acodec.out.wav
stddev: 101.67 PSNR: 56.19 bytes: 1058444/ 1058444
-f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/a-pcm_mulaw.wav
-529256 ./tests/data/a-pcm_mulaw.wav
+f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/acodec/pcm_mulaw.wav
+529256 ./tests/data/acodec/pcm_mulaw.wav
1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.acodec.out.wav
stddev: 103.38 PSNR: 56.04 bytes: 1058444/ 1058444
-b7936d7170e0efefb379349d81aed360 *./tests/data/a-pcm_s8.mov
-530837 ./tests/data/a-pcm_s8.mov
+b7936d7170e0efefb379349d81aed360 *./tests/data/acodec/pcm_s8.mov
+530837 ./tests/data/acodec/pcm_s8.mov
652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.acodec.out.wav
stddev: 147.89 PSNR: 52.93 bytes: 1058444/ 1058444
-98cadb3502dbdc99e6e077c28b1a036c *./tests/data/a-pcm_u8.wav
-529244 ./tests/data/a-pcm_u8.wav
+98cadb3502dbdc99e6e077c28b1a036c *./tests/data/acodec/pcm_u8.wav
+529244 ./tests/data/acodec/pcm_u8.wav
652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.acodec.out.wav
stddev: 147.89 PSNR: 52.93 bytes: 1058444/ 1058444
-c42b9c04305455250366c84e17c1023f *./tests/data/a-pcm_s16be.mov
-1060037 ./tests/data/a-pcm_s16be.mov
+c42b9c04305455250366c84e17c1023f *./tests/data/acodec/pcm_s16be.mov
+1060037 ./tests/data/acodec/pcm_s16be.mov
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/a-pcm_s16le.wav
-1058444 ./tests/data/a-pcm_s16le.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/acodec/pcm_s16le.wav
+1058444 ./tests/data/acodec/pcm_s16le.wav
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-2f3e0884e96b984436b1d01200d68871 *./tests/data/a-pcm_s16be.mkv
-1060705 ./tests/data/a-pcm_s16be.mkv
+2f3e0884e96b984436b1d01200d68871 *./tests/data/acodec/pcm_s16be.mkv
+1060705 ./tests/data/acodec/pcm_s16be.mkv
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-c98158732635effefffa006251b9a6c9 *./tests/data/a-pcm_s16le.mkv
-1060705 ./tests/data/a-pcm_s16le.mkv
+c98158732635effefffa006251b9a6c9 *./tests/data/acodec/pcm_s16le.mkv
+1060705 ./tests/data/acodec/pcm_s16le.mkv
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/a-pcm_s24be.mov
-1589237 ./tests/data/a-pcm_s24be.mov
+07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/acodec/pcm_s24be.mov
+1589237 ./tests/data/acodec/pcm_s24be.mov
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/a-pcm_s24le.wav
-1587668 ./tests/data/a-pcm_s24le.wav
+a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/acodec/pcm_s24le.wav
+1587668 ./tests/data/acodec/pcm_s24le.wav
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
-2118437 ./tests/data/a-pcm_s32be.mov
+d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/acodec/pcm_s32be.mov
+2118437 ./tests/data/acodec/pcm_s32be.mov
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-da6ed80f4f40f0082577dea80827e014 *./tests/data/a-pcm_s32le.wav
-2116868 ./tests/data/a-pcm_s32le.wav
+da6ed80f4f40f0082577dea80827e014 *./tests/data/acodec/pcm_s32le.wav
+2116868 ./tests/data/acodec/pcm_s32le.wav
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/a-pcm_f32be.au
-2116824 ./tests/data/a-pcm_f32be.au
+118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/acodec/pcm_f32be.au
+2116824 ./tests/data/acodec/pcm_f32be.au
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-46f44f86a18984a832206ab9e29a79f2 *./tests/data/a-pcm_f32le.wav
-2116880 ./tests/data/a-pcm_f32le.wav
+46f44f86a18984a832206ab9e29a79f2 *./tests/data/acodec/pcm_f32le.wav
+2116880 ./tests/data/acodec/pcm_f32le.wav
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-8112296b1ed94f72f20d04b1a54850a7 *./tests/data/a-pcm_f64be.au
-4233624 ./tests/data/a-pcm_f64be.au
+8112296b1ed94f72f20d04b1a54850a7 *./tests/data/acodec/pcm_f64be.au
+4233624 ./tests/data/acodec/pcm_f64be.au
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/a-pcm_f64le.wav
-4233680 ./tests/data/a-pcm_f64le.wav
+ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/acodec/pcm_f64le.wav
+4233680 ./tests/data/acodec/pcm_f64le.wav
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
-8c74234928ed425b1171211a89f67ead *./tests/data/a-pcm_zork.wav
-529256 ./tests/data/a-pcm_zork.wav
+8c74234928ed425b1171211a89f67ead *./tests/data/acodec/pcm_zork.wav
+529256 ./tests/data/acodec/pcm_zork.wav
864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.acodec.out.wav
stddev: 633.10 PSNR: 40.30 bytes: 1058444/ 1058444
-8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
-10368730 ./tests/data/a-pcm_s24daud.302
+8168a5c1343553ef027541830f2cb879 *./tests/data/acodec/pcm_s24daud.302
+10368730 ./tests/data/acodec/pcm_s24daud.302
f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm.acodec.out.wav
stddev: 9415.16 PSNR: 16.85 bytes: 6911864/ 1058444
diff --git a/tests/ref/acodec/wmav1 b/tests/ref/acodec/wmav1
index 8fdd3ec293..f1bb69c4f9 100644
--- a/tests/ref/acodec/wmav1
+++ b/tests/ref/acodec/wmav1
@@ -1,4 +1,4 @@
-26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
-106004 ./tests/data/a-wmav1.asf
+26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/acodec/wmav1.asf
+106004 ./tests/data/acodec/wmav1.asf
stddev:12245.27 PSNR: 14.57 bytes: 1065004/ 1058444
stddev: 2097.78 PSNR: 29.89 bytes: 1056812/ 1058444
diff --git a/tests/ref/acodec/wmav2 b/tests/ref/acodec/wmav2
index ce8a74a552..ca18dea7a5 100644
--- a/tests/ref/acodec/wmav2
+++ b/tests/ref/acodec/wmav2
@@ -1,4 +1,4 @@
-7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
-106044 ./tests/data/a-wmav2.asf
+7c6c0cb692af01b312ae345723674b5f *./tests/data/acodec/wmav2.asf
+106044 ./tests/data/acodec/wmav2.asf
stddev:12249.69 PSNR: 14.57 bytes: 1065004/ 1058444
stddev: 2091.12 PSNR: 29.92 bytes: 1056812/ 1058444
diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index 3378fa3bc9..e5d6fc375b 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-379908755146d4ead062abe9c3b5c582 *./tests/data/b-lavf.aif
-90166 ./tests/data/b-lavf.aif
-./tests/data/b-lavf.aif CRC=0xf1ae5536
+379908755146d4ead062abe9c3b5c582 *./tests/data/lavf/lavf.aif
+90166 ./tests/data/lavf/lavf.aif
+./tests/data/lavf/lavf.aif CRC=0xf1ae5536
diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/alaw
index 68814cfdc1..65bcf99036 100644
--- a/tests/ref/lavf/alaw
+++ b/tests/ref/lavf/alaw
@@ -1,3 +1,3 @@
-8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/b-lavf.al
-45056 ./tests/data/b-lavf.al
-./tests/data/b-lavf.al CRC=0x5e6d372b
+8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/lavf/lavf.al
+45056 ./tests/data/lavf/lavf.al
+./tests/data/lavf/lavf.al CRC=0x5e6d372b
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf
index e5c09af087..533a3c3591 100644
--- a/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@ -1,3 +1,3 @@
-c544bb40c2f4c09d44318db5228ee499 *./tests/data/b-lavf.asf
-333375 ./tests/data/b-lavf.asf
-./tests/data/b-lavf.asf CRC=0x9f5ab3e6
+c544bb40c2f4c09d44318db5228ee499 *./tests/data/lavf/lavf.asf
+333375 ./tests/data/lavf/lavf.asf
+./tests/data/lavf/lavf.asf CRC=0x9f5ab3e6
diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au
index a56899ee7d..15f2a4bda2 100644
--- a/tests/ref/lavf/au
+++ b/tests/ref/lavf/au
@@ -1,3 +1,3 @@
-dbd11f783219485cae32024e47c19dfb *./tests/data/b-lavf.au
-90136 ./tests/data/b-lavf.au
-./tests/data/b-lavf.au CRC=0xf1ae5536
+dbd11f783219485cae32024e47c19dfb *./tests/data/lavf/lavf.au
+90136 ./tests/data/lavf/lavf.au
+./tests/data/lavf/lavf.au CRC=0xf1ae5536
diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi
index 2cf5abbfca..cf47755ab7 100644
--- a/tests/ref/lavf/avi
+++ b/tests/ref/lavf/avi
@@ -1,3 +1,3 @@
-7e5e4db8c04f0acd16cff6b30e60d0e5 *./tests/data/b-lavf.avi
-331032 ./tests/data/b-lavf.avi
-./tests/data/b-lavf.avi CRC=0x2a83e6b0
+7e5e4db8c04f0acd16cff6b30e60d0e5 *./tests/data/lavf/lavf.avi
+331032 ./tests/data/lavf/lavf.avi
+./tests/data/lavf/lavf.avi CRC=0x2a83e6b0
diff --git a/tests/ref/lavf/bmp b/tests/ref/lavf/bmp
index 1f20c11c5d..72cd57ae69 100644
--- a/tests/ref/lavf/bmp
+++ b/tests/ref/lavf/bmp
@@ -1,3 +1,3 @@
-71f4d64a6b3c71f43a4eff526f84841c *./tests/data/b-lavf02.bmp
-./tests/data/b-lavf%02d.bmp CRC=0xe6c71946
-304182 ./tests/data/b-lavf02.bmp
+71f4d64a6b3c71f43a4eff526f84841c *./tests/data/lavf/lavf02.bmp
+./tests/data/lavf/lavf%02d.bmp CRC=0xe6c71946
+304182 ./tests/data/lavf/lavf02.bmp
diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt
index 6f54194b27..7406dff532 100644
--- a/tests/ref/lavf/dv_fmt
+++ b/tests/ref/lavf/dv_fmt
@@ -1,3 +1,3 @@
-522e5e5a46b99f8ad8aabdaf3d2f1869 *./tests/data/b-lavf.dv
-3600000 ./tests/data/b-lavf.dv
-./tests/data/b-lavf.dv CRC=0x02c0af30
+522e5e5a46b99f8ad8aabdaf3d2f1869 *./tests/data/lavf/lavf.dv
+3600000 ./tests/data/lavf/lavf.dv
+./tests/data/lavf/lavf.dv CRC=0x02c0af30
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
index e833944dbf..fdc003f32b 100644
--- a/tests/ref/lavf/ffm
+++ b/tests/ref/lavf/ffm
@@ -1,3 +1,3 @@
-03fc7f90bba9361cf6128cd4655fb20f *./tests/data/b-lavf.ffm
-376832 ./tests/data/b-lavf.ffm
-./tests/data/b-lavf.ffm CRC=0xf361ed74
+03fc7f90bba9361cf6128cd4655fb20f *./tests/data/lavf/lavf.ffm
+376832 ./tests/data/lavf/lavf.ffm
+./tests/data/lavf/lavf.ffm CRC=0xf361ed74
diff --git a/tests/ref/lavf/flv_fmt b/tests/ref/lavf/flv_fmt
index 674b689852..1d38b6fd8b 100644
--- a/tests/ref/lavf/flv_fmt
+++ b/tests/ref/lavf/flv_fmt
@@ -1,3 +1,3 @@
-62c3177547fb5853a5116661802e1ae2 *./tests/data/b-lavf.flv
-329541 ./tests/data/b-lavf.flv
-./tests/data/b-lavf.flv CRC=0x881785d1
+62c3177547fb5853a5116661802e1ae2 *./tests/data/lavf/lavf.flv
+329541 ./tests/data/lavf/lavf.flv
+./tests/data/lavf/lavf.flv CRC=0x881785d1
diff --git a/tests/ref/lavf/gif b/tests/ref/lavf/gif
index 57c27119a9..21f639d857 100644
--- a/tests/ref/lavf/gif
+++ b/tests/ref/lavf/gif
@@ -1,2 +1,2 @@
-98968ceb210ab260a6a7af36767b94d3 *./tests/data/b-lavf.gif
-2906382 ./tests/data/b-lavf.gif
+98968ceb210ab260a6a7af36767b94d3 *./tests/data/lavf/lavf.gif
+2906382 ./tests/data/lavf/lavf.gif
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index 8bb0fe8ba8..d147bc47b7 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,3 +1,3 @@
-bf5c730bb8426dbcfc5420e71ee490f2 *./tests/data/b-lavf.gxf
-796392 ./tests/data/b-lavf.gxf
-./tests/data/b-lavf.gxf CRC=0xad9e86eb
+b52bf18b403ac9a0d12048b2f66cb24c *./tests/data/lavf/lavf.gxf
+796392 ./tests/data/lavf/lavf.gxf
+./tests/data/lavf/lavf.gxf CRC=0xad9e86eb
diff --git a/tests/ref/lavf/jpg b/tests/ref/lavf/jpg
index 07b5b5fe3d..b924f4461c 100644
--- a/tests/ref/lavf/jpg
+++ b/tests/ref/lavf/jpg
@@ -1,3 +1,3 @@
-d56c19d41e9754939ea0f15d09bc4a32 *./tests/data/b-lavf02.jpg
-./tests/data/b-lavf%02d.jpg CRC=0xb8bc5a32
-31763 ./tests/data/b-lavf02.jpg
+d56c19d41e9754939ea0f15d09bc4a32 *./tests/data/lavf/lavf02.jpg
+./tests/data/lavf/lavf%02d.jpg CRC=0xb8bc5a32
+31763 ./tests/data/lavf/lavf02.jpg
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 4752594e77..dc8dfef6d2 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,3 @@
-bd21b559633e3789a1fd00da1eb3e6a3 *./tests/data/b-lavf.mkv
- 320487 ./tests/data/b-lavf.mkv
-./tests/data/b-lavf.mkv CRC=0x2a83e6b0
+bd21b559633e3789a1fd00da1eb3e6a3 *./tests/data/lavf/lavf.mkv
+ 320487 ./tests/data/lavf/lavf.mkv
+./tests/data/lavf/lavf.mkv CRC=0x2a83e6b0
diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf
index b212349e93..756527c82a 100644
--- a/tests/ref/lavf/mmf
+++ b/tests/ref/lavf/mmf
@@ -1,3 +1,3 @@
-272b91d8fc31ed43b08246d182719751 *./tests/data/b-lavf.mmf
-22609 ./tests/data/b-lavf.mmf
-./tests/data/b-lavf.mmf CRC=0x03633476
+272b91d8fc31ed43b08246d182719751 *./tests/data/lavf/lavf.mmf
+22609 ./tests/data/lavf/lavf.mmf
+./tests/data/lavf/lavf.mmf CRC=0x03633476
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov
index 5a46b84ccb..943c605d93 100644
--- a/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@ -1,3 +1,3 @@
-c145305a775eb2de43cdf94eb1ab5240 *./tests/data/b-lavf.mov
-357669 ./tests/data/b-lavf.mov
-./tests/data/b-lavf.mov CRC=0x2f6a9b26
+c145305a775eb2de43cdf94eb1ab5240 *./tests/data/lavf/lavf.mov
+357669 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index c6cf9a22f1..9b1664f566 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,3 @@
-e36a005ecca9add8bda6e0655d03716f *./tests/data/b-lavf.mpg
-372736 ./tests/data/b-lavf.mpg
-./tests/data/b-lavf.mpg CRC=0x2b39ed74
+e36a005ecca9add8bda6e0655d03716f *./tests/data/lavf/lavf.mpg
+372736 ./tests/data/lavf/lavf.mpg
+./tests/data/lavf/lavf.mpg CRC=0x2b39ed74
diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/mulaw
index 7120005991..c6fa0588f0 100644
--- a/tests/ref/lavf/mulaw
+++ b/tests/ref/lavf/mulaw
@@ -1,3 +1,3 @@
-e64027a96ad5907ee281deff3286da0a *./tests/data/b-lavf.ul
-45056 ./tests/data/b-lavf.ul
-./tests/data/b-lavf.ul CRC=0xe028b50a
+e64027a96ad5907ee281deff3286da0a *./tests/data/lavf/lavf.ul
+45056 ./tests/data/lavf/lavf.ul
+./tests/data/lavf/lavf.ul CRC=0xe028b50a
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index e16cfae8d8..d758ec2698 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,6 +1,6 @@
-2e436c226936c478eaee9bb18027cba0 *./tests/data/b-lavf.mxf
-525881 ./tests/data/b-lavf.mxf
-./tests/data/b-lavf.mxf CRC=0x12bb8196
-b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/b-lavf.mxf_d10
-5330989 ./tests/data/b-lavf.mxf_d10
-./tests/data/b-lavf.mxf_d10 CRC=0xc3f4f92e
+2e436c226936c478eaee9bb18027cba0 *./tests/data/lavf/lavf.mxf
+525881 ./tests/data/lavf/lavf.mxf
+./tests/data/lavf/lavf.mxf CRC=0x12bb8196
+b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10
+5330989 ./tests/data/lavf/lavf.mxf_d10
+./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e
diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut
index 2a425f9cda..461b18587c 100644
--- a/tests/ref/lavf/nut
+++ b/tests/ref/lavf/nut
@@ -1,3 +1,3 @@
-16b9d2cf8effb7dae316c6b9248a49b7 *./tests/data/b-lavf.nut
-319888 ./tests/data/b-lavf.nut
-./tests/data/b-lavf.nut CRC=0x2a83e6b0
+16b9d2cf8effb7dae316c6b9248a49b7 *./tests/data/lavf/lavf.nut
+319888 ./tests/data/lavf/lavf.nut
+./tests/data/lavf/lavf.nut CRC=0x2a83e6b0
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index 0fbec5099a..d6eb447cc5 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-89faca973d88ff2f5dd20992a11de107 *./tests/data/b-lavf.ogg
-14063 ./tests/data/b-lavf.ogg
-./tests/data/b-lavf.ogg CRC=0xf1ae5536
+89faca973d88ff2f5dd20992a11de107 *./tests/data/lavf/lavf.ogg
+14063 ./tests/data/lavf/lavf.ogg
+./tests/data/lavf/lavf.ogg CRC=0xf1ae5536
diff --git a/tests/ref/lavf/pbmpipe b/tests/ref/lavf/pbmpipe
index 8ce6fa2740..d50ed716bc 100644
--- a/tests/ref/lavf/pbmpipe
+++ b/tests/ref/lavf/pbmpipe
@@ -1,3 +1,3 @@
-8ced96f5b6b7362358199ae993b4ceb7 *./tests/data/b-pbmpipe.pbm
-317075 ./tests/data/b-pbmpipe.pbm
-./tests/data/b-pbmpipe.pbm CRC=0xfae0a1ba
+8ced96f5b6b7362358199ae993b4ceb7 *./tests/data/lavf/pbmpipe.pbm
+317075 ./tests/data/lavf/pbmpipe.pbm
+./tests/data/lavf/pbmpipe.pbm CRC=0xfae0a1ba
diff --git a/tests/ref/lavf/pcx b/tests/ref/lavf/pcx
index 1cbc0e7d26..491c16dd5c 100644
--- a/tests/ref/lavf/pcx
+++ b/tests/ref/lavf/pcx
@@ -1,3 +1,3 @@
-2df1d747fba23d03b6ff9c91b8b465c9 *./tests/data/b-lavf02.pcx
-./tests/data/b-lavf%02d.pcx CRC=0x6da01946
-364147 ./tests/data/b-lavf02.pcx
+2df1d747fba23d03b6ff9c91b8b465c9 *./tests/data/lavf/lavf02.pcx
+./tests/data/lavf/lavf%02d.pcx CRC=0x6da01946
+364147 ./tests/data/lavf/lavf02.pcx
diff --git a/tests/ref/lavf/pgm b/tests/ref/lavf/pgm
index 9dae05325b..420e6c4874 100644
--- a/tests/ref/lavf/pgm
+++ b/tests/ref/lavf/pgm
@@ -1,3 +1,3 @@
-388f5c51a678ca6a52cc006095c12f08 *./tests/data/b-lavf02.pgm
-./tests/data/b-lavf%02d.pgm CRC=0x418d2963
-101391 ./tests/data/b-lavf02.pgm
+388f5c51a678ca6a52cc006095c12f08 *./tests/data/lavf/lavf02.pgm
+./tests/data/lavf/lavf%02d.pgm CRC=0x418d2963
+101391 ./tests/data/lavf/lavf02.pgm
diff --git a/tests/ref/lavf/pgmpipe b/tests/ref/lavf/pgmpipe
index 7b86712a52..28ad60ea59 100644
--- a/tests/ref/lavf/pgmpipe
+++ b/tests/ref/lavf/pgmpipe
@@ -1,3 +1,3 @@
-04e66c8e9e064c8310bd657ee559bd70 *./tests/data/b-pgmpipe.pgm
-2534775 ./tests/data/b-pgmpipe.pgm
-./tests/data/b-pgmpipe.pgm CRC=0xadf48ba9
+04e66c8e9e064c8310bd657ee559bd70 *./tests/data/lavf/pgmpipe.pgm
+2534775 ./tests/data/lavf/pgmpipe.pgm
+./tests/data/lavf/pgmpipe.pgm CRC=0xadf48ba9
diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt
index a6f6c313da..d15ed7f475 100644
--- a/tests/ref/lavf/pixfmt
+++ b/tests/ref/lavf/pixfmt
@@ -1,38 +1,38 @@
-5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/b-lavf-yuv420p.yuv
-304128 ./tests/data/b-lavf-yuv420p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *./tests/data/b-lavf-yuv422p.yuv
-304128 ./tests/data/b-lavf-yuv422p.yuv
-5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/b-lavf-yuv444p.yuv
-304128 ./tests/data/b-lavf-yuv444p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *./tests/data/b-lavf-yuyv422.yuv
-304128 ./tests/data/b-lavf-yuyv422.yuv
-507c7e9f0c97660385df977469ca9e6d *./tests/data/b-lavf-yuv410p.yuv
-304128 ./tests/data/b-lavf-yuv410p.yuv
-8594ea0b8d7c2c964525b0801b5351de *./tests/data/b-lavf-yuv411p.yuv
-304128 ./tests/data/b-lavf-yuv411p.yuv
-66673539adf8cda28e3b76068d3aae61 *./tests/data/b-lavf-yuvj420p.yuv
-304128 ./tests/data/b-lavf-yuvj420p.yuv
-572bf387dd1e3f073cbfd082e055ca81 *./tests/data/b-lavf-yuvj422p.yuv
-304128 ./tests/data/b-lavf-yuvj422p.yuv
-c10442da177c9f1d12be3c53be6fa12c *./tests/data/b-lavf-yuvj444p.yuv
-304128 ./tests/data/b-lavf-yuvj444p.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/b-lavf-rgb24.yuv
-304128 ./tests/data/b-lavf-rgb24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/b-lavf-bgr24.yuv
-304128 ./tests/data/b-lavf-bgr24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/b-lavf-rgb32.yuv
-304128 ./tests/data/b-lavf-rgb32.yuv
-66d39d464bd89ded2a124897f0a75ade *./tests/data/b-lavf-rgb565.yuv
-304128 ./tests/data/b-lavf-rgb565.yuv
-c894c3bd8d2631ed1964500b90a0c350 *./tests/data/b-lavf-rgb555.yuv
-304128 ./tests/data/b-lavf-rgb555.yuv
-6be306b0cce5f8e6c271ea17fef9745b *./tests/data/b-lavf-gray.yuv
-304128 ./tests/data/b-lavf-gray.yuv
-31398104d2349dd48328a6862bc6711f *./tests/data/b-lavf-monow.yuv
-304128 ./tests/data/b-lavf-monow.yuv
-31398104d2349dd48328a6862bc6711f *./tests/data/b-lavf-monob.yuv
-304128 ./tests/data/b-lavf-monob.yuv
-00b85790df5740bab95e2559d81603a7 *./tests/data/b-lavf-yuv440p.yuv
-304128 ./tests/data/b-lavf-yuv440p.yuv
-4d8d402c45d913038d4b725396719111 *./tests/data/b-lavf-yuvj440p.yuv
-304128 ./tests/data/b-lavf-yuvj440p.yuv
+5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/lavf/lavf-yuv420p.yuv
+304128 ./tests/data/lavf/lavf-yuv420p.yuv
+ac68f9fdd9d55efd0306d9b004038761 *./tests/data/lavf/lavf-yuv422p.yuv
+304128 ./tests/data/lavf/lavf-yuv422p.yuv
+5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/lavf/lavf-yuv444p.yuv
+304128 ./tests/data/lavf/lavf-yuv444p.yuv
+ac68f9fdd9d55efd0306d9b004038761 *./tests/data/lavf/lavf-yuyv422.yuv
+304128 ./tests/data/lavf/lavf-yuyv422.yuv
+507c7e9f0c97660385df977469ca9e6d *./tests/data/lavf/lavf-yuv410p.yuv
+304128 ./tests/data/lavf/lavf-yuv410p.yuv
+8594ea0b8d7c2c964525b0801b5351de *./tests/data/lavf/lavf-yuv411p.yuv
+304128 ./tests/data/lavf/lavf-yuv411p.yuv
+66673539adf8cda28e3b76068d3aae61 *./tests/data/lavf/lavf-yuvj420p.yuv
+304128 ./tests/data/lavf/lavf-yuvj420p.yuv
+572bf387dd1e3f073cbfd082e055ca81 *./tests/data/lavf/lavf-yuvj422p.yuv
+304128 ./tests/data/lavf/lavf-yuvj422p.yuv
+c10442da177c9f1d12be3c53be6fa12c *./tests/data/lavf/lavf-yuvj444p.yuv
+304128 ./tests/data/lavf/lavf-yuvj444p.yuv
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/lavf/lavf-rgb24.yuv
+304128 ./tests/data/lavf/lavf-rgb24.yuv
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/lavf/lavf-bgr24.yuv
+304128 ./tests/data/lavf/lavf-bgr24.yuv
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/lavf/lavf-rgb32.yuv
+304128 ./tests/data/lavf/lavf-rgb32.yuv
+66d39d464bd89ded2a124897f0a75ade *./tests/data/lavf/lavf-rgb565.yuv
+304128 ./tests/data/lavf/lavf-rgb565.yuv
+c894c3bd8d2631ed1964500b90a0c350 *./tests/data/lavf/lavf-rgb555.yuv
+304128 ./tests/data/lavf/lavf-rgb555.yuv
+6be306b0cce5f8e6c271ea17fef9745b *./tests/data/lavf/lavf-gray.yuv
+304128 ./tests/data/lavf/lavf-gray.yuv
+31398104d2349dd48328a6862bc6711f *./tests/data/lavf/lavf-monow.yuv
+304128 ./tests/data/lavf/lavf-monow.yuv
+31398104d2349dd48328a6862bc6711f *./tests/data/lavf/lavf-monob.yuv
+304128 ./tests/data/lavf/lavf-monob.yuv
+00b85790df5740bab95e2559d81603a7 *./tests/data/lavf/lavf-yuv440p.yuv
+304128 ./tests/data/lavf/lavf-yuv440p.yuv
+4d8d402c45d913038d4b725396719111 *./tests/data/lavf/lavf-yuvj440p.yuv
+304128 ./tests/data/lavf/lavf-yuvj440p.yuv
diff --git a/tests/ref/lavf/ppm b/tests/ref/lavf/ppm
index 726b27b07d..26a1250f65 100644
--- a/tests/ref/lavf/ppm
+++ b/tests/ref/lavf/ppm
@@ -1,3 +1,3 @@
-16d5dadf0b362fc8ba3cb676c5dde985 *./tests/data/b-lavf02.ppm
-./tests/data/b-lavf%02d.ppm CRC=0x6da01946
-304143 ./tests/data/b-lavf02.ppm
+16d5dadf0b362fc8ba3cb676c5dde985 *./tests/data/lavf/lavf02.ppm
+./tests/data/lavf/lavf%02d.ppm CRC=0x6da01946
+304143 ./tests/data/lavf/lavf02.ppm
diff --git a/tests/ref/lavf/ppmpipe b/tests/ref/lavf/ppmpipe
index 8c91f6aa20..b703e16e50 100644
--- a/tests/ref/lavf/ppmpipe
+++ b/tests/ref/lavf/ppmpipe
@@ -1,3 +1,3 @@
-74f1f6651ad8f192a7b4c11c2b6c71e5 *./tests/data/b-ppmpipe.ppm
-7603575 ./tests/data/b-ppmpipe.ppm
-./tests/data/b-ppmpipe.ppm CRC=0x87b3c15f
+74f1f6651ad8f192a7b4c11c2b6c71e5 *./tests/data/lavf/ppmpipe.ppm
+7603575 ./tests/data/lavf/ppmpipe.ppm
+./tests/data/lavf/ppmpipe.ppm CRC=0x87b3c15f
diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm
index 7370ccd196..0966c0cc85 100644
--- a/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@ -1,2 +1,2 @@
-e60d3e69beaf94a5c3d2e3344cc620dd *./tests/data/b-lavf.rm
-346706 ./tests/data/b-lavf.rm
+e60d3e69beaf94a5c3d2e3344cc620dd *./tests/data/lavf/lavf.rm
+346706 ./tests/data/lavf/lavf.rm
diff --git a/tests/ref/lavf/sgi b/tests/ref/lavf/sgi
index 35ae1f3585..402f6f017c 100644
--- a/tests/ref/lavf/sgi
+++ b/tests/ref/lavf/sgi
@@ -1,3 +1,3 @@
-7054acafd275e51cec28d4518e213081 *./tests/data/b-lavf02.sgi
-./tests/data/b-lavf%02d.sgi CRC=0x6da01946
-308151 ./tests/data/b-lavf02.sgi
+7054acafd275e51cec28d4518e213081 *./tests/data/lavf/lavf02.sgi
+./tests/data/lavf/lavf%02d.sgi CRC=0x6da01946
+308151 ./tests/data/lavf/lavf02.sgi
diff --git a/tests/ref/lavf/swf b/tests/ref/lavf/swf
index a0b02ae8d7..1e07793e1e 100644
--- a/tests/ref/lavf/swf
+++ b/tests/ref/lavf/swf
@@ -1,3 +1,3 @@
-62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/b-lavf.swf
-329479 ./tests/data/b-lavf.swf
-./tests/data/b-lavf.swf CRC=0x881785d1
+62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/lavf/lavf.swf
+329479 ./tests/data/lavf/lavf.swf
+./tests/data/lavf/lavf.swf CRC=0x881785d1
diff --git a/tests/ref/lavf/tga b/tests/ref/lavf/tga
index d8040bd93b..75849c9bde 100644
--- a/tests/ref/lavf/tga
+++ b/tests/ref/lavf/tga
@@ -1,3 +1,3 @@
-c0305c53e6d79d4ed9f35f04f671246c *./tests/data/b-lavf02.tga
-./tests/data/b-lavf%02d.tga CRC=0xe6c71946
-304172 ./tests/data/b-lavf02.tga
+c0305c53e6d79d4ed9f35f04f671246c *./tests/data/lavf/lavf02.tga
+./tests/data/lavf/lavf%02d.tga CRC=0xe6c71946
+304172 ./tests/data/lavf/lavf02.tga
diff --git a/tests/ref/lavf/tiff b/tests/ref/lavf/tiff
index 99f576e836..082c7434e1 100644
--- a/tests/ref/lavf/tiff
+++ b/tests/ref/lavf/tiff
@@ -1,3 +1,3 @@
-b3299346a8959553a437e486d8f3bf76 *./tests/data/b-lavf02.tiff
-./tests/data/b-lavf%02d.tiff CRC=0x6da01946
-307131 ./tests/data/b-lavf02.tiff
+b3299346a8959553a437e486d8f3bf76 *./tests/data/lavf/lavf02.tiff
+./tests/data/lavf/lavf%02d.tiff CRC=0x6da01946
+307131 ./tests/data/lavf/lavf02.tiff
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index 6f19705096..28acde18fd 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-3ecdc566c525d58bc287ce1baffd9407 *./tests/data/b-lavf.ts
- 430144 ./tests/data/b-lavf.ts
-./tests/data/b-lavf.ts CRC=0x133216c1
+3ecdc566c525d58bc287ce1baffd9407 *./tests/data/lavf/lavf.ts
+ 430144 ./tests/data/lavf/lavf.ts
+./tests/data/lavf/lavf.ts CRC=0x133216c1
diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc
index ea96f4d458..25e8b44434 100644
--- a/tests/ref/lavf/voc
+++ b/tests/ref/lavf/voc
@@ -1,3 +1,3 @@
-b0bc287ce4e3eef7c1012610dd7ff6d0 *./tests/data/b-lavf.voc
-32768 ./tests/data/b-lavf.voc
-./tests/data/b-lavf.voc CRC=0xa2d77c12
+b0bc287ce4e3eef7c1012610dd7ff6d0 *./tests/data/lavf/lavf.voc
+32768 ./tests/data/lavf/lavf.voc
+./tests/data/lavf/lavf.voc CRC=0xa2d77c12
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav
index dc4757de7e..aa6f943724 100644
--- a/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@ -1,3 +1,3 @@
-6a3bec31d92baf52161e25179ebba315 *./tests/data/b-lavf.wav
-90156 ./tests/data/b-lavf.wav
-./tests/data/b-lavf.wav CRC=0xf1ae5536
+6a3bec31d92baf52161e25179ebba315 *./tests/data/lavf/lavf.wav
+90156 ./tests/data/lavf/lavf.wav
+./tests/data/lavf/lavf.wav CRC=0xf1ae5536
diff --git a/tests/ref/lavf/yuv4mpeg b/tests/ref/lavf/yuv4mpeg
index 2717418546..8c1566ea0d 100644
--- a/tests/ref/lavf/yuv4mpeg
+++ b/tests/ref/lavf/yuv4mpeg
@@ -1,2 +1,2 @@
-ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/b-lavf.y4m
-3801808 ./tests/data/b-lavf.y4m
+ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/lavf/lavf.y4m
+3801808 ./tests/data/lavf/lavf.y4m
diff --git a/tests/ref/vsynth1/asv1 b/tests/ref/vsynth1/asv1
index 02a141f908..15ba70b2a0 100644
--- a/tests/ref/vsynth1/asv1
+++ b/tests/ref/vsynth1/asv1
@@ -1,4 +1,4 @@
-b4ce4698764ef2328346badb7227ecbe *./tests/data/a-asv1.avi
-1489656 ./tests/data/a-asv1.avi
+b4ce4698764ef2328346badb7227ecbe *./tests/data/vsynth1/asv1.avi
+1489656 ./tests/data/vsynth1/asv1.avi
2dfc5dfc2c1cbbc2543257cd3d2df6af *./tests/data/asv1.vsynth1.out.yuv
stddev: 20.00 PSNR: 22.11 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/asv2 b/tests/ref/vsynth1/asv2
index fe3e39ebcc..4ac42e1c54 100644
--- a/tests/ref/vsynth1/asv2
+++ b/tests/ref/vsynth1/asv2
@@ -1,4 +1,4 @@
-dfba6eaf58e515e324c2b370bfcd9158 *./tests/data/a-asv2.avi
-1456056 ./tests/data/a-asv2.avi
+dfba6eaf58e515e324c2b370bfcd9158 *./tests/data/vsynth1/asv2.avi
+1456056 ./tests/data/vsynth1/asv2.avi
d451be09793cd0f35b6d91fc36e2571a *./tests/data/asv2.vsynth1.out.yuv
stddev: 18.82 PSNR: 22.63 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/dnxhd_1080i b/tests/ref/vsynth1/dnxhd_1080i
index a9872c106b..7429b7d915 100644
--- a/tests/ref/vsynth1/dnxhd_1080i
+++ b/tests/ref/vsynth1/dnxhd_1080i
@@ -1,4 +1,4 @@
-cd1489f18d2186a49ab23c61ed33bce7 *./tests/data/a-dnxhd-1080i.mov
-3031875 ./tests/data/a-dnxhd-1080i.mov
+cd1489f18d2186a49ab23c61ed33bce7 *./tests/data/vsynth1/dnxhd-1080i.mov
+3031875 ./tests/data/vsynth1/dnxhd-1080i.mov
0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv
stddev: 6.29 PSNR: 32.15 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth1/dnxhd_720p b/tests/ref/vsynth1/dnxhd_720p
index e15eb2a1a6..490a9ea643 100644
--- a/tests/ref/vsynth1/dnxhd_720p
+++ b/tests/ref/vsynth1/dnxhd_720p
@@ -1,4 +1,4 @@
-81f5be451dc18cf8a1d333c7885de60b *./tests/data/a-dnxhd-720p.dnxhd
-2293760 ./tests/data/a-dnxhd-720p.dnxhd
+81f5be451dc18cf8a1d333c7885de60b *./tests/data/vsynth1/dnxhd-720p.dnxhd
+2293760 ./tests/data/vsynth1/dnxhd-720p.dnxhd
94b21e5e68ccf9471eff74afd0ebe319 *./tests/data/dnxhd_720p.vsynth1.out.yuv
stddev: 6.32 PSNR: 32.11 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth1/dnxhd_720p_rd b/tests/ref/vsynth1/dnxhd_720p_rd
index bab45920fb..f18ae2da1a 100644
--- a/tests/ref/vsynth1/dnxhd_720p_rd
+++ b/tests/ref/vsynth1/dnxhd_720p_rd
@@ -1,4 +1,4 @@
-1dc6e95925c4f3a230848ec17c02abed *./tests/data/a-dnxhd-720p-rd.dnxhd
-2293760 ./tests/data/a-dnxhd-720p-rd.dnxhd
+1dc6e95925c4f3a230848ec17c02abed *./tests/data/vsynth1/dnxhd-720p-rd.dnxhd
+2293760 ./tests/data/vsynth1/dnxhd-720p-rd.dnxhd
02972d2aec120ec1577ec9053d68ae0f *./tests/data/dnxhd_720p_rd.vsynth1.out.yuv
stddev: 6.26 PSNR: 32.19 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth1/dv b/tests/ref/vsynth1/dv
index f48f04ec7f..7b6f1f962c 100644
--- a/tests/ref/vsynth1/dv
+++ b/tests/ref/vsynth1/dv
@@ -1,8 +1,8 @@
-27ade3031b17214cf81c19cbf70f37d7 *./tests/data/a-dv.dv
-7200000 ./tests/data/a-dv.dv
+27ade3031b17214cf81c19cbf70f37d7 *./tests/data/vsynth1/dv.dv
+7200000 ./tests/data/vsynth1/dv.dv
02ac7cdeab91d4d5621e7ce96dddc498 *./tests/data/dv.vsynth1.out.yuv
stddev: 6.90 PSNR: 31.34 bytes: 7603200/ 7603200
-bd67f2431db160d4bb6dcd791cea6efd *./tests/data/a-dv411.dv
-7200000 ./tests/data/a-dv411.dv
+bd67f2431db160d4bb6dcd791cea6efd *./tests/data/vsynth1/dv411.dv
+7200000 ./tests/data/vsynth1/dv411.dv
b6640a3a572353f51284acb746eb00c4 *./tests/data/dv.vsynth1.out.yuv
stddev: 30.76 PSNR: 18.37 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/dv50 b/tests/ref/vsynth1/dv50
index 91a99935a3..1e6454d9b7 100644
--- a/tests/ref/vsynth1/dv50
+++ b/tests/ref/vsynth1/dv50
@@ -1,4 +1,4 @@
-26dba84f0ea895b914ef5b333d8394ac *./tests/data/a-dv50.dv
-14400000 ./tests/data/a-dv50.dv
+26dba84f0ea895b914ef5b333d8394ac *./tests/data/vsynth1/dv50.dv
+14400000 ./tests/data/vsynth1/dv50.dv
a2ff093e93ffed10f730fa21df02fc50 *./tests/data/dv50.vsynth1.out.yuv
stddev: 1.72 PSNR: 43.38 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/error b/tests/ref/vsynth1/error
index 136523476f..9d958113f0 100644
--- a/tests/ref/vsynth1/error
+++ b/tests/ref/vsynth1/error
@@ -1,4 +1,4 @@
-7416dfd319f04044d4575dc9d1b406e1 *./tests/data/a-error-mpeg4-adv.avi
-756836 ./tests/data/a-error-mpeg4-adv.avi
+7416dfd319f04044d4575dc9d1b406e1 *./tests/data/vsynth1/error-mpeg4-adv.avi
+756836 ./tests/data/vsynth1/error-mpeg4-adv.avi
0d21f59c1600f5b6afb90b5278e28cd6 *./tests/data/error.vsynth1.out.yuv
stddev: 18.08 PSNR: 22.98 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/ffv1 b/tests/ref/vsynth1/ffv1
index f63945db00..e888d96e7c 100644
--- a/tests/ref/vsynth1/ffv1
+++ b/tests/ref/vsynth1/ffv1
@@ -1,4 +1,4 @@
-67ddc7edde5cca49290245d881787890 *./tests/data/a-ffv1.avi
-2655376 ./tests/data/a-ffv1.avi
+67ddc7edde5cca49290245d881787890 *./tests/data/vsynth1/ffv1.avi
+2655376 ./tests/data/vsynth1/ffv1.avi
c5ccac874dbf808e9088bc3107860042 *./tests/data/ffv1.vsynth1.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/flashsv b/tests/ref/vsynth1/flashsv
index b581fadc06..6d76e9a652 100644
--- a/tests/ref/vsynth1/flashsv
+++ b/tests/ref/vsynth1/flashsv
@@ -1,4 +1,4 @@
-97894502b4cb57aca1105b6333f72dae *./tests/data/a-flashsv.flv
-14681925 ./tests/data/a-flashsv.flv
+97894502b4cb57aca1105b6333f72dae *./tests/data/vsynth1/flashsv.flv
+14681925 ./tests/data/vsynth1/flashsv.flv
947cb24ec45a453348ae6fe3fa278071 *./tests/data/flashsv.vsynth1.out.yuv
stddev: 2.85 PSNR: 39.03 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/flv b/tests/ref/vsynth1/flv
index 7e253438e3..04e22eb87f 100644
--- a/tests/ref/vsynth1/flv
+++ b/tests/ref/vsynth1/flv
@@ -1,4 +1,4 @@
-d6a80659cedee7698aefe9c4a8285fa4 *./tests/data/a-flv.flv
-636269 ./tests/data/a-flv.flv
+d6a80659cedee7698aefe9c4a8285fa4 *./tests/data/vsynth1/flv.flv
+636269 ./tests/data/vsynth1/flv.flv
5ab46d8dd01dbb1d63df2a84858a4b05 *./tests/data/flv.vsynth1.out.yuv
stddev: 8.02 PSNR: 30.04 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/h261 b/tests/ref/vsynth1/h261
index 2b1149f5c9..2be9855788 100644
--- a/tests/ref/vsynth1/h261
+++ b/tests/ref/vsynth1/h261
@@ -1,4 +1,4 @@
-d155470b713aeebacb85980b0d5f2ce3 *./tests/data/a-h261.avi
-707588 ./tests/data/a-h261.avi
+d155470b713aeebacb85980b0d5f2ce3 *./tests/data/vsynth1/h261.avi
+707588 ./tests/data/vsynth1/h261.avi
716e83cb51afb1246bfaa80967df48ea *./tests/data/h261.vsynth1.out.yuv
stddev: 9.11 PSNR: 28.93 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/h263 b/tests/ref/vsynth1/h263
index 7d7e3e6187..5703029c2e 100644
--- a/tests/ref/vsynth1/h263
+++ b/tests/ref/vsynth1/h263
@@ -1,4 +1,4 @@
-fb4dc9b9eac2628c56cb82cf332e1f58 *./tests/data/a-h263.avi
-659686 ./tests/data/a-h263.avi
+fb4dc9b9eac2628c56cb82cf332e1f58 *./tests/data/vsynth1/h263.avi
+659686 ./tests/data/vsynth1/h263.avi
1a1ba9a3a63ec1a1a9585fded0a7c954 *./tests/data/h263.vsynth1.out.yuv
stddev: 8.03 PSNR: 30.03 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/h263p b/tests/ref/vsynth1/h263p
index f2907a7730..6ca658f6dd 100644
--- a/tests/ref/vsynth1/h263p
+++ b/tests/ref/vsynth1/h263p
@@ -1,4 +1,4 @@
-bbcadeceba295e1dad148aea1e57c370 *./tests/data/a-h263p.avi
-2328348 ./tests/data/a-h263p.avi
+bbcadeceba295e1dad148aea1e57c370 *./tests/data/vsynth1/h263p.avi
+2328348 ./tests/data/vsynth1/h263p.avi
9554cda00c3487ab3ffda2c3ea22fa2f *./tests/data/h263p.vsynth1.out.yuv
stddev: 2.06 PSNR: 41.83 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/huffyuv b/tests/ref/vsynth1/huffyuv
index 7fd4c77dd2..f84eee437a 100644
--- a/tests/ref/vsynth1/huffyuv
+++ b/tests/ref/vsynth1/huffyuv
@@ -1,4 +1,4 @@
-ace2536fa169d835d0fb332abde28d51 *./tests/data/a-huffyuv.avi
-7933800 ./tests/data/a-huffyuv.avi
+ace2536fa169d835d0fb332abde28d51 *./tests/data/vsynth1/huffyuv.avi
+7933800 ./tests/data/vsynth1/huffyuv.avi
c5ccac874dbf808e9088bc3107860042 *./tests/data/huffyuv.vsynth1.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/jpegls b/tests/ref/vsynth1/jpegls
index 42d89143dc..4e26ec6210 100644
--- a/tests/ref/vsynth1/jpegls
+++ b/tests/ref/vsynth1/jpegls
@@ -1,4 +1,4 @@
-519e26bb1ac0f3db8f90b36537f2f760 *./tests/data/a-jpegls.avi
-9089812 ./tests/data/a-jpegls.avi
+519e26bb1ac0f3db8f90b36537f2f760 *./tests/data/vsynth1/jpegls.avi
+9089812 ./tests/data/vsynth1/jpegls.avi
947cb24ec45a453348ae6fe3fa278071 *./tests/data/jpegls.vsynth1.out.yuv
stddev: 2.85 PSNR: 39.03 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/ljpeg b/tests/ref/vsynth1/ljpeg
index 8628fea688..3202bfcf9d 100644
--- a/tests/ref/vsynth1/ljpeg
+++ b/tests/ref/vsynth1/ljpeg
@@ -1,4 +1,4 @@
-9092f306f165b98ab0bb4f576f198ad5 *./tests/data/a-ljpeg.avi
-6312936 ./tests/data/a-ljpeg.avi
+9092f306f165b98ab0bb4f576f198ad5 *./tests/data/vsynth1/ljpeg.avi
+6312936 ./tests/data/vsynth1/ljpeg.avi
c5ccac874dbf808e9088bc3107860042 *./tests/data/ljpeg.vsynth1.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mjpeg b/tests/ref/vsynth1/mjpeg
index f6bd7e47ee..4f6bf83719 100644
--- a/tests/ref/vsynth1/mjpeg
+++ b/tests/ref/vsynth1/mjpeg
@@ -1,4 +1,4 @@
-af7ddc0d60cb2d1d83b0bfd829cc7b3a *./tests/data/a-mjpeg.avi
-1570366 ./tests/data/a-mjpeg.avi
+af7ddc0d60cb2d1d83b0bfd829cc7b3a *./tests/data/vsynth1/mjpeg.avi
+1570366 ./tests/data/vsynth1/mjpeg.avi
556ba548fe2b1b4ca98ef3f5d5e94bb8 *./tests/data/mjpeg.vsynth1.out.yuv
stddev: 7.92 PSNR: 30.15 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg b/tests/ref/vsynth1/mpeg
index 174fbf5501..882486b70b 100644
--- a/tests/ref/vsynth1/mpeg
+++ b/tests/ref/vsynth1/mpeg
@@ -1,4 +1,4 @@
-1428744c6d5835f27506e69be4f837f4 *./tests/data/a-mpeg1.mpg
-712006 ./tests/data/a-mpeg1.mpg
+1428744c6d5835f27506e69be4f837f4 *./tests/data/vsynth1/mpeg1.mpg
+712006 ./tests/data/vsynth1/mpeg1.mpg
58f0c332bf689117b57fa629a2bc0d2b *./tests/data/mpeg.vsynth1.out.yuv
stddev: 7.62 PSNR: 30.48 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg1b b/tests/ref/vsynth1/mpeg1b
index f7a3c8b5b4..d3f9ce4096 100644
--- a/tests/ref/vsynth1/mpeg1b
+++ b/tests/ref/vsynth1/mpeg1b
@@ -1,4 +1,4 @@
-6bc1f2414aaca7e26f85a68992bc8c1c *./tests/data/a-mpeg1b.mpg
-1035727 ./tests/data/a-mpeg1b.mpg
+6bc1f2414aaca7e26f85a68992bc8c1c *./tests/data/vsynth1/mpeg1b.mpg
+1035727 ./tests/data/vsynth1/mpeg1b.mpg
8c9ff248bde54f4509913c80f843ed5f *./tests/data/mpeg1b.vsynth1.out.yuv
stddev: 6.31 PSNR: 32.12 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg2 b/tests/ref/vsynth1/mpeg2
index 975ae88799..5d8a32b3d1 100644
--- a/tests/ref/vsynth1/mpeg2
+++ b/tests/ref/vsynth1/mpeg2
@@ -1,20 +1,20 @@
-fbddea2368cd2028fc8db4dfd4682e94 *./tests/data/a-mpeg2.mpg
-728044 ./tests/data/a-mpeg2.mpg
+fbddea2368cd2028fc8db4dfd4682e94 *./tests/data/vsynth1/mpeg2.mpg
+728044 ./tests/data/vsynth1/mpeg2.mpg
b41ca49c1a02e66ce64d262e2cdaec15 *./tests/data/mpeg2.vsynth1.out.yuv
stddev: 7.65 PSNR: 30.45 bytes: 7603200/ 7603200
-8762c08210b88bf7b8b71a1fe1f5d169 *./tests/data/a-mpeg2ivlc-qprd.mpg
-789623 ./tests/data/a-mpeg2ivlc-qprd.mpg
+8762c08210b88bf7b8b71a1fe1f5d169 *./tests/data/vsynth1/mpeg2ivlc-qprd.mpg
+789623 ./tests/data/vsynth1/mpeg2ivlc-qprd.mpg
606712937b56e82958874d04ae3ba51a *./tests/data/mpeg2.vsynth1.out.yuv
stddev: 10.07 PSNR: 28.06 bytes: 7603200/ 7603200
-9aacd4f385b4d48b723aac50b97f105e *./tests/data/a-mpeg2_422.mpg
-726333 ./tests/data/a-mpeg2_422.mpg
+9aacd4f385b4d48b723aac50b97f105e *./tests/data/vsynth1/mpeg2_422.mpg
+726333 ./tests/data/vsynth1/mpeg2_422.mpg
5f1f31587eca77c95206d4e1bcf93a08 *./tests/data/mpeg2.vsynth1.out.yuv
stddev: 63.33 PSNR: 12.10 bytes: 10137600/ 7603200
-4c067397b504d65532d7779cd36f3f88 *./tests/data/a-mpeg2.mpg
-725668 ./tests/data/a-mpeg2.mpg
+4c067397b504d65532d7779cd36f3f88 *./tests/data/vsynth1/mpeg2.mpg
+725668 ./tests/data/vsynth1/mpeg2.mpg
9f7b065f98d57cdecf90e6f7a2524eb5 *./tests/data/mpeg2.vsynth1.out.yuv
stddev: 7.65 PSNR: 30.45 bytes: 7603200/ 7603200
-ec3f6713c88a2b41f6c369fd64341077 *./tests/data/a-mpeg2i.mpg
-737473 ./tests/data/a-mpeg2i.mpg
+ec3f6713c88a2b41f6c369fd64341077 *./tests/data/vsynth1/mpeg2i.mpg
+737473 ./tests/data/vsynth1/mpeg2i.mpg
97615390fdd69abfcbc7e02df863a7d2 *./tests/data/mpeg2.vsynth1.out.yuv
stddev: 7.67 PSNR: 30.43 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg2thread b/tests/ref/vsynth1/mpeg2thread
index d04c7ccec0..0f8e485320 100644
--- a/tests/ref/vsynth1/mpeg2thread
+++ b/tests/ref/vsynth1/mpeg2thread
@@ -1,12 +1,12 @@
-522d56a8a2a130ff6b81535e53765fdc *./tests/data/a-mpeg2thread.mpg
-804929 ./tests/data/a-mpeg2thread.mpg
+522d56a8a2a130ff6b81535e53765fdc *./tests/data/vsynth1/mpeg2thread.mpg
+804929 ./tests/data/vsynth1/mpeg2thread.mpg
1c802c997553895b39fe9a5032ee7821 *./tests/data/mpeg2thread.vsynth1.out.yuv
stddev: 7.64 PSNR: 30.47 bytes: 7603200/ 7603200
-0f4f31f6e16f39dcb67b7730687e8e4e *./tests/data/a-mpeg2threadivlc.mpg
-795389 ./tests/data/a-mpeg2threadivlc.mpg
+0f4f31f6e16f39dcb67b7730687e8e4e *./tests/data/vsynth1/mpeg2threadivlc.mpg
+795389 ./tests/data/vsynth1/mpeg2threadivlc.mpg
1c802c997553895b39fe9a5032ee7821 *./tests/data/mpeg2thread.vsynth1.out.yuv
stddev: 7.64 PSNR: 30.47 bytes: 7603200/ 7603200
-adfde15b5bbeef3096b0adf7b20ccb93 *./tests/data/a-mpeg2reuse.mpg
-2081247 ./tests/data/a-mpeg2reuse.mpg
+adfde15b5bbeef3096b0adf7b20ccb93 *./tests/data/vsynth1/mpeg2reuse.mpg
+2081247 ./tests/data/vsynth1/mpeg2reuse.mpg
6dbda80b4d368833625316d0400d32dd *./tests/data/mpeg2thread.vsynth1.out.yuv
stddev: 7.67 PSNR: 30.42 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg4 b/tests/ref/vsynth1/mpeg4
index 1b23d2138d..3156fed8c4 100644
--- a/tests/ref/vsynth1/mpeg4
+++ b/tests/ref/vsynth1/mpeg4
@@ -1,4 +1,4 @@
-fd83f2ef5887a62b4d755d7cb5f0ac59 *./tests/data/a-odivx.mp4
-540144 ./tests/data/a-odivx.mp4
+fd83f2ef5887a62b4d755d7cb5f0ac59 *./tests/data/vsynth1/odivx.mp4
+540144 ./tests/data/vsynth1/odivx.mp4
8828a375448dc5c2215163ba70656f89 *./tests/data/mpeg4.vsynth1.out.yuv
stddev: 7.97 PSNR: 30.10 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg4adv b/tests/ref/vsynth1/mpeg4adv
index c34814f2ce..8e85a18522 100644
--- a/tests/ref/vsynth1/mpeg4adv
+++ b/tests/ref/vsynth1/mpeg4adv
@@ -1,16 +1,16 @@
-7d8eb01fd68d83d62a98585757704d47 *./tests/data/a-mpeg4-adv.avi
-589716 ./tests/data/a-mpeg4-adv.avi
+7d8eb01fd68d83d62a98585757704d47 *./tests/data/vsynth1/mpeg4-adv.avi
+589716 ./tests/data/vsynth1/mpeg4-adv.avi
f8b226876b1b2c0b98fd6928fd9adbd8 *./tests/data/mpeg4adv.vsynth1.out.yuv
stddev: 6.98 PSNR: 31.25 bytes: 7603200/ 7603200
-7fc9389fc73794b1e98d89566afeda4d *./tests/data/a-mpeg4-qprd.avi
-714568 ./tests/data/a-mpeg4-qprd.avi
+7fc9389fc73794b1e98d89566afeda4d *./tests/data/vsynth1/mpeg4-qprd.avi
+714568 ./tests/data/vsynth1/mpeg4-qprd.avi
177dd172b52df66918f2a505b2df4879 *./tests/data/mpeg4adv.vsynth1.out.yuv
stddev: 9.82 PSNR: 28.28 bytes: 7603200/ 7603200
-0750613b0fb110b356b043a39720a41c *./tests/data/a-mpeg4-adap.avi
-404656 ./tests/data/a-mpeg4-adap.avi
+0750613b0fb110b356b043a39720a41c *./tests/data/vsynth1/mpeg4-adap.avi
+404656 ./tests/data/vsynth1/mpeg4-adap.avi
ccd90097ac60e91b8bb2012d31196414 *./tests/data/mpeg4adv.vsynth1.out.yuv
stddev: 14.05 PSNR: 25.17 bytes: 7603200/ 7603200
-9e677d08f1738569a70e9a387ae7d744 *./tests/data/a-mpeg4-Q.avi
-867046 ./tests/data/a-mpeg4-Q.avi
+9e677d08f1738569a70e9a387ae7d744 *./tests/data/vsynth1/mpeg4-Q.avi
+867046 ./tests/data/vsynth1/mpeg4-Q.avi
72870f1438ec0502169a5aea5be6f42f *./tests/data/mpeg4adv.vsynth1.out.yuv
stddev: 5.61 PSNR: 33.14 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg4nr b/tests/ref/vsynth1/mpeg4nr
index 265d285dad..24ed8de287 100644
--- a/tests/ref/vsynth1/mpeg4nr
+++ b/tests/ref/vsynth1/mpeg4nr
@@ -1,4 +1,4 @@
-c02f54157ba08ca12ad979c6308212ad *./tests/data/a-mpeg4-nr.avi
-675638 ./tests/data/a-mpeg4-nr.avi
+c02f54157ba08ca12ad979c6308212ad *./tests/data/vsynth1/mpeg4-nr.avi
+675638 ./tests/data/vsynth1/mpeg4-nr.avi
d2b89d5958fb7331f6c9e5b7ecaaa5b6 *./tests/data/mpeg4nr.vsynth1.out.yuv
stddev: 6.99 PSNR: 31.23 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/mpeg4thread b/tests/ref/vsynth1/mpeg4thread
index f10cd457fa..7f7f39ec63 100644
--- a/tests/ref/vsynth1/mpeg4thread
+++ b/tests/ref/vsynth1/mpeg4thread
@@ -1,4 +1,4 @@
-7dbabe6477b1cdbeaa231434dbacebb9 *./tests/data/a-mpeg4-thread.avi
-778486 ./tests/data/a-mpeg4-thread.avi
+7dbabe6477b1cdbeaa231434dbacebb9 *./tests/data/vsynth1/mpeg4-thread.avi
+778486 ./tests/data/vsynth1/mpeg4-thread.avi
2e9f6ee6059f433d05cc95aa4ff7b3d9 *./tests/data/mpeg4thread.vsynth1.out.yuv
stddev: 10.13 PSNR: 28.01 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/msmpeg4 b/tests/ref/vsynth1/msmpeg4
index 8f16afb6b2..46b72f12da 100644
--- a/tests/ref/vsynth1/msmpeg4
+++ b/tests/ref/vsynth1/msmpeg4
@@ -1,4 +1,4 @@
-d437c6ab3775c50fdec00fa744bb5add *./tests/data/a-msmpeg4.avi
-624718 ./tests/data/a-msmpeg4.avi
+d437c6ab3775c50fdec00fa744bb5add *./tests/data/vsynth1/msmpeg4.avi
+624718 ./tests/data/vsynth1/msmpeg4.avi
5ca72c39e3fc5df8e62f223c869589f5 *./tests/data/msmpeg4.vsynth1.out.yuv
stddev: 7.98 PSNR: 30.09 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/msmpeg4v2 b/tests/ref/vsynth1/msmpeg4v2
index 761fd978cd..69bd62f077 100644
--- a/tests/ref/vsynth1/msmpeg4v2
+++ b/tests/ref/vsynth1/msmpeg4v2
@@ -1,4 +1,4 @@
-88957e35efcc718bce0307627ad3298d *./tests/data/a-msmpeg4v2.avi
-623788 ./tests/data/a-msmpeg4v2.avi
+88957e35efcc718bce0307627ad3298d *./tests/data/vsynth1/msmpeg4v2.avi
+623788 ./tests/data/vsynth1/msmpeg4v2.avi
c6ff1041a0ef62c2a2e5ef519e5e94c4 *./tests/data/msmpeg4v2.vsynth1.out.yuv
stddev: 7.97 PSNR: 30.10 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/rc b/tests/ref/vsynth1/rc
index cf27d90e00..cf64de4f8a 100644
--- a/tests/ref/vsynth1/rc
+++ b/tests/ref/vsynth1/rc
@@ -1,4 +1,4 @@
-b7c96b3d7ef2965cf95ddeedf5251790 *./tests/data/a-mpeg4-rc.avi
-832136 ./tests/data/a-mpeg4-rc.avi
+b7c96b3d7ef2965cf95ddeedf5251790 *./tests/data/vsynth1/mpeg4-rc.avi
+832136 ./tests/data/vsynth1/mpeg4-rc.avi
650eef31987debab2b6576d302eac456 *./tests/data/rc.vsynth1.out.yuv
stddev: 10.24 PSNR: 27.92 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/roq b/tests/ref/vsynth1/roq
index 5e410720b5..086ae1ce74 100644
--- a/tests/ref/vsynth1/roq
+++ b/tests/ref/vsynth1/roq
@@ -1,4 +1,4 @@
-cf8b7b0e539bab3169c234ca63d71dd8 *./tests/data/a-roqav.roq
-101671 ./tests/data/a-roqav.roq
+cf8b7b0e539bab3169c234ca63d71dd8 *./tests/data/vsynth1/roqav.roq
+101671 ./tests/data/vsynth1/roqav.roq
0ad983c291b1ed373645c5b12a108c61 *./tests/data/roq.vsynth1.out.yuv
stddev: 7.74 PSNR: 30.35 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth1/rv10 b/tests/ref/vsynth1/rv10
index dc0dd1a8fd..7cd50d14d6 100644
--- a/tests/ref/vsynth1/rv10
+++ b/tests/ref/vsynth1/rv10
@@ -1,4 +1,4 @@
-4d7e82de72a83905cf84b8abc3e70b8f *./tests/data/a-rv10.rm
-653905 ./tests/data/a-rv10.rm
+4d7e82de72a83905cf84b8abc3e70b8f *./tests/data/vsynth1/rv10.rm
+653905 ./tests/data/vsynth1/rv10.rm
1a1ba9a3a63ec1a1a9585fded0a7c954 *./tests/data/rv10.vsynth1.out.yuv
stddev: 8.03 PSNR: 30.03 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/rv20 b/tests/ref/vsynth1/rv20
index c03d76e75b..d8cc2ccea7 100644
--- a/tests/ref/vsynth1/rv20
+++ b/tests/ref/vsynth1/rv20
@@ -1,4 +1,4 @@
-49f656b3a84bd7173ca219fae310750c *./tests/data/a-rv20.rm
-627450 ./tests/data/a-rv20.rm
+49f656b3a84bd7173ca219fae310750c *./tests/data/vsynth1/rv20.rm
+627450 ./tests/data/vsynth1/rv20.rm
a94d2babdc506b95951977cb55642981 *./tests/data/rv20.vsynth1.out.yuv
stddev: 8.24 PSNR: 29.81 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/snow b/tests/ref/vsynth1/snow
index 07573b585c..9178115132 100644
--- a/tests/ref/vsynth1/snow
+++ b/tests/ref/vsynth1/snow
@@ -1,4 +1,4 @@
-d593b3c1a9729ce6dd1721f58fa93712 *./tests/data/a-snow.avi
-136088 ./tests/data/a-snow.avi
+d593b3c1a9729ce6dd1721f58fa93712 *./tests/data/vsynth1/snow.avi
+136088 ./tests/data/vsynth1/snow.avi
91021b7d6d7908648fe78cc1975af8c4 *./tests/data/snow.vsynth1.out.yuv
stddev: 22.77 PSNR: 20.98 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/snowll b/tests/ref/vsynth1/snowll
index bcc9f3c56e..0246038dec 100644
--- a/tests/ref/vsynth1/snowll
+++ b/tests/ref/vsynth1/snowll
@@ -1,4 +1,4 @@
-6d29e8c06a645cdee45073c4f3d0004e *./tests/data/a-snow53.avi
-3419980 ./tests/data/a-snow53.avi
+6d29e8c06a645cdee45073c4f3d0004e *./tests/data/vsynth1/snow53.avi
+3419980 ./tests/data/vsynth1/snow53.avi
c5ccac874dbf808e9088bc3107860042 *./tests/data/snowll.vsynth1.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/svq1 b/tests/ref/vsynth1/svq1
index 11050fa43d..b6c95ea6cc 100644
--- a/tests/ref/vsynth1/svq1
+++ b/tests/ref/vsynth1/svq1
@@ -1,4 +1,4 @@
-595fc4e38734521356b60e67b813f0fa *./tests/data/a-svq1.mov
-1334367 ./tests/data/a-svq1.mov
+595fc4e38734521356b60e67b813f0fa *./tests/data/vsynth1/svq1.mov
+1334367 ./tests/data/vsynth1/svq1.mov
9cc35c54b2c77d36bd7e308b393c1f81 *./tests/data/svq1.vsynth1.out.yuv
stddev: 9.58 PSNR: 28.50 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/wmv1 b/tests/ref/vsynth1/wmv1
index 05131de4bd..891c88be8e 100644
--- a/tests/ref/vsynth1/wmv1
+++ b/tests/ref/vsynth1/wmv1
@@ -1,4 +1,4 @@
-4f3461315776e5118866fa3819cff9b6 *./tests/data/a-wmv1.avi
-626908 ./tests/data/a-wmv1.avi
+4f3461315776e5118866fa3819cff9b6 *./tests/data/vsynth1/wmv1.avi
+626908 ./tests/data/vsynth1/wmv1.avi
5182edba5b5e0354b39ce4f3604b62da *./tests/data/wmv1.vsynth1.out.yuv
stddev: 7.97 PSNR: 30.09 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth1/wmv2 b/tests/ref/vsynth1/wmv2
index 5dc15ec278..2e72290faf 100644
--- a/tests/ref/vsynth1/wmv2
+++ b/tests/ref/vsynth1/wmv2
@@ -1,4 +1,4 @@
-13efda9d3811345aadc0632fc9a9332b *./tests/data/a-wmv2.avi
-659852 ./tests/data/a-wmv2.avi
+13efda9d3811345aadc0632fc9a9332b *./tests/data/vsynth1/wmv2.avi
+659852 ./tests/data/vsynth1/wmv2.avi
5182edba5b5e0354b39ce4f3604b62da *./tests/data/wmv2.vsynth1.out.yuv
stddev: 7.97 PSNR: 30.09 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/asv1 b/tests/ref/vsynth2/asv1
index c42c6ab078..a584645a99 100644
--- a/tests/ref/vsynth2/asv1
+++ b/tests/ref/vsynth2/asv1
@@ -1,4 +1,4 @@
-4eb34d2de25f67a2706456e999338fe9 *./tests/data/a-asv1.avi
-832512 ./tests/data/a-asv1.avi
+4eb34d2de25f67a2706456e999338fe9 *./tests/data/vsynth2/asv1.avi
+832512 ./tests/data/vsynth2/asv1.avi
c96ff7fd17c52f99ddb7922a4cb9168f *./tests/data/asv1.vsynth2.out.yuv
stddev: 10.47 PSNR: 27.73 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/asv2 b/tests/ref/vsynth2/asv2
index 34cfddb9e8..b8984204da 100644
--- a/tests/ref/vsynth2/asv2
+++ b/tests/ref/vsynth2/asv2
@@ -1,4 +1,4 @@
-9649a4b68fb1107bad13e8a7574cc72d *./tests/data/a-asv2.avi
-789072 ./tests/data/a-asv2.avi
+9649a4b68fb1107bad13e8a7574cc72d *./tests/data/vsynth2/asv2.avi
+789072 ./tests/data/vsynth2/asv2.avi
74a78015b64b2cf8cb9da2e44f508a69 *./tests/data/asv2.vsynth2.out.yuv
stddev: 10.28 PSNR: 27.89 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/dnxhd_1080i b/tests/ref/vsynth2/dnxhd_1080i
index 2abd53bcee..6ab7fbbbf9 100644
--- a/tests/ref/vsynth2/dnxhd_1080i
+++ b/tests/ref/vsynth2/dnxhd_1080i
@@ -1,4 +1,4 @@
-1a4594983ae91f41907b89fe3174c527 *./tests/data/a-dnxhd-1080i.mov
-3031875 ./tests/data/a-dnxhd-1080i.mov
+1a4594983ae91f41907b89fe3174c527 *./tests/data/vsynth2/dnxhd-1080i.mov
+3031875 ./tests/data/vsynth2/dnxhd-1080i.mov
3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth2.out.yuv
stddev: 1.31 PSNR: 45.77 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth2/dnxhd_720p b/tests/ref/vsynth2/dnxhd_720p
index ed1ecd7bb8..cbf3f37575 100644
--- a/tests/ref/vsynth2/dnxhd_720p
+++ b/tests/ref/vsynth2/dnxhd_720p
@@ -1,4 +1,4 @@
-58e07cc6ae0a2d36787044d0e82708a6 *./tests/data/a-dnxhd-720p.dnxhd
-2293760 ./tests/data/a-dnxhd-720p.dnxhd
+58e07cc6ae0a2d36787044d0e82708a6 *./tests/data/vsynth2/dnxhd-720p.dnxhd
+2293760 ./tests/data/vsynth2/dnxhd-720p.dnxhd
ab601eaafef74d80d3d20b780dddd836 *./tests/data/dnxhd_720p.vsynth2.out.yuv
stddev: 1.36 PSNR: 45.45 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth2/dnxhd_720p_rd b/tests/ref/vsynth2/dnxhd_720p_rd
index b8d29cad8f..e922495226 100644
--- a/tests/ref/vsynth2/dnxhd_720p_rd
+++ b/tests/ref/vsynth2/dnxhd_720p_rd
@@ -1,4 +1,4 @@
-092ffb7b8cf3c11556bb05dbb8b476ac *./tests/data/a-dnxhd-720p-rd.dnxhd
-2293760 ./tests/data/a-dnxhd-720p-rd.dnxhd
+092ffb7b8cf3c11556bb05dbb8b476ac *./tests/data/vsynth2/dnxhd-720p-rd.dnxhd
+2293760 ./tests/data/vsynth2/dnxhd-720p-rd.dnxhd
33547ca318acff9448cba719cb99296d *./tests/data/dnxhd_720p_rd.vsynth2.out.yuv
stddev: 1.32 PSNR: 45.66 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth2/dv b/tests/ref/vsynth2/dv
index 40f04fe728..72e4350ce9 100644
--- a/tests/ref/vsynth2/dv
+++ b/tests/ref/vsynth2/dv
@@ -1,8 +1,8 @@
-bfa766f89bfeabc0ae1044f3954bed52 *./tests/data/a-dv.dv
-7200000 ./tests/data/a-dv.dv
+bfa766f89bfeabc0ae1044f3954bed52 *./tests/data/vsynth2/dv.dv
+7200000 ./tests/data/vsynth2/dv.dv
7ec62bd3350a6848364669e6e1e4b9cc *./tests/data/dv.vsynth2.out.yuv
stddev: 1.71 PSNR: 43.47 bytes: 7603200/ 7603200
-00a9d8683ac6826af41bcf7223fb0389 *./tests/data/a-dv411.dv
-7200000 ./tests/data/a-dv411.dv
+00a9d8683ac6826af41bcf7223fb0389 *./tests/data/vsynth2/dv411.dv
+7200000 ./tests/data/vsynth2/dv411.dv
7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv.vsynth2.out.yuv
stddev: 10.09 PSNR: 28.05 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/dv50 b/tests/ref/vsynth2/dv50
index 2a92a7759f..79c25a8b8c 100644
--- a/tests/ref/vsynth2/dv50
+++ b/tests/ref/vsynth2/dv50
@@ -1,4 +1,4 @@
-61e31c79e8949b25c849753a0785b0d7 *./tests/data/a-dv50.dv
-14400000 ./tests/data/a-dv50.dv
+61e31c79e8949b25c849753a0785b0d7 *./tests/data/vsynth2/dv50.dv
+14400000 ./tests/data/vsynth2/dv50.dv
af3f2dd5ab62c1a1d98b07d4aeb6852f *./tests/data/dv50.vsynth2.out.yuv
stddev: 0.82 PSNR: 49.82 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/error b/tests/ref/vsynth2/error
index e5e3a22c09..59b043920e 100644
--- a/tests/ref/vsynth2/error
+++ b/tests/ref/vsynth2/error
@@ -1,4 +1,4 @@
-90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/a-error-mpeg4-adv.avi
-176588 ./tests/data/a-error-mpeg4-adv.avi
+90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/vsynth2/error-mpeg4-adv.avi
+176588 ./tests/data/vsynth2/error-mpeg4-adv.avi
113defd3f8daf878e0b3fc03fafb4c09 *./tests/data/error.vsynth2.out.yuv
stddev: 9.02 PSNR: 29.02 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/ffv1 b/tests/ref/vsynth2/ffv1
index b7e7da6dc9..f7dd8e9f89 100644
--- a/tests/ref/vsynth2/ffv1
+++ b/tests/ref/vsynth2/ffv1
@@ -1,4 +1,4 @@
-d72b0960e162d4998b9acbabb07e99ab *./tests/data/a-ffv1.avi
-3525804 ./tests/data/a-ffv1.avi
+d72b0960e162d4998b9acbabb07e99ab *./tests/data/vsynth2/ffv1.avi
+3525804 ./tests/data/vsynth2/ffv1.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ffv1.vsynth2.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/flashsv b/tests/ref/vsynth2/flashsv
index 989abdff0a..b5f0bcee3c 100644
--- a/tests/ref/vsynth2/flashsv
+++ b/tests/ref/vsynth2/flashsv
@@ -1,4 +1,4 @@
-0667077971e0cb63b5f49c580006e90e *./tests/data/a-flashsv.flv
-12368953 ./tests/data/a-flashsv.flv
+0667077971e0cb63b5f49c580006e90e *./tests/data/vsynth2/flashsv.flv
+12368953 ./tests/data/vsynth2/flashsv.flv
592b3321994e26a990deb3a0a1415de9 *./tests/data/flashsv.vsynth2.out.yuv
stddev: 0.65 PSNR: 51.84 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/flv b/tests/ref/vsynth2/flv
index d518e26e50..7fa57db9e1 100644
--- a/tests/ref/vsynth2/flv
+++ b/tests/ref/vsynth2/flv
@@ -1,4 +1,4 @@
-2edc92093d36506bcc0a5c0e17e86113 *./tests/data/a-flv.flv
-131360 ./tests/data/a-flv.flv
+2edc92093d36506bcc0a5c0e17e86113 *./tests/data/vsynth2/flv.flv
+131360 ./tests/data/vsynth2/flv.flv
8999c8264fb0941561f64c4a736e9d88 *./tests/data/flv.vsynth2.out.yuv
stddev: 5.33 PSNR: 33.59 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/h261 b/tests/ref/vsynth2/h261
index 4db457e493..ef9454cd18 100644
--- a/tests/ref/vsynth2/h261
+++ b/tests/ref/vsynth2/h261
@@ -1,4 +1,4 @@
-dfd005d4c9030a0dc889c828a6408b9c *./tests/data/a-h261.avi
-191086 ./tests/data/a-h261.avi
+dfd005d4c9030a0dc889c828a6408b9c *./tests/data/vsynth2/h261.avi
+191086 ./tests/data/vsynth2/h261.avi
db7ceff174823b98834faa2320ca89ac *./tests/data/h261.vsynth2.out.yuv
stddev: 6.37 PSNR: 32.03 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/h263 b/tests/ref/vsynth2/h263
index aa19a654d5..739ba52926 100644
--- a/tests/ref/vsynth2/h263
+++ b/tests/ref/vsynth2/h263
@@ -1,4 +1,4 @@
-9a368687ab34c48079f11a202839a6bc *./tests/data/a-h263.avi
-160106 ./tests/data/a-h263.avi
+9a368687ab34c48079f11a202839a6bc *./tests/data/vsynth2/h263.avi
+160106 ./tests/data/vsynth2/h263.avi
61213b91b359697ebcefb9e0a53ac54a *./tests/data/h263.vsynth2.out.yuv
stddev: 5.43 PSNR: 33.42 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/h263p b/tests/ref/vsynth2/h263p
index 3f27dd31dc..3c26eb0530 100644
--- a/tests/ref/vsynth2/h263p
+++ b/tests/ref/vsynth2/h263p
@@ -1,4 +1,4 @@
-c7644d40e9f40bbd98e5a978f9f94bb4 *./tests/data/a-h263p.avi
-868018 ./tests/data/a-h263p.avi
+c7644d40e9f40bbd98e5a978f9f94bb4 *./tests/data/vsynth2/h263p.avi
+868018 ./tests/data/vsynth2/h263p.avi
4b0ee791f280029dc03c528f76f195d4 *./tests/data/h263p.vsynth2.out.yuv
stddev: 1.91 PSNR: 42.50 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/huffyuv b/tests/ref/vsynth2/huffyuv
index 8f3617befc..e0e7277ede 100644
--- a/tests/ref/vsynth2/huffyuv
+++ b/tests/ref/vsynth2/huffyuv
@@ -1,4 +1,4 @@
-56cd44907a48990e06bd065e189ff461 *./tests/data/a-huffyuv.avi
-6455232 ./tests/data/a-huffyuv.avi
+56cd44907a48990e06bd065e189ff461 *./tests/data/vsynth2/huffyuv.avi
+6455232 ./tests/data/vsynth2/huffyuv.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/huffyuv.vsynth2.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/jpegls b/tests/ref/vsynth2/jpegls
index a17c742d2d..3f87fd2fd2 100644
--- a/tests/ref/vsynth2/jpegls
+++ b/tests/ref/vsynth2/jpegls
@@ -1,4 +1,4 @@
-4fc53937f048c900ae6d50fda9dba206 *./tests/data/a-jpegls.avi
-8334630 ./tests/data/a-jpegls.avi
+4fc53937f048c900ae6d50fda9dba206 *./tests/data/vsynth2/jpegls.avi
+8334630 ./tests/data/vsynth2/jpegls.avi
592b3321994e26a990deb3a0a1415de9 *./tests/data/jpegls.vsynth2.out.yuv
stddev: 0.65 PSNR: 51.84 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/ljpeg b/tests/ref/vsynth2/ljpeg
index b1a0056b52..aec9b56725 100644
--- a/tests/ref/vsynth2/ljpeg
+++ b/tests/ref/vsynth2/ljpeg
@@ -1,4 +1,4 @@
-554a4a6a5a9058c588f8bf2de405bc70 *./tests/data/a-ljpeg.avi
-4766914 ./tests/data/a-ljpeg.avi
+554a4a6a5a9058c588f8bf2de405bc70 *./tests/data/vsynth2/ljpeg.avi
+4766914 ./tests/data/vsynth2/ljpeg.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ljpeg.vsynth2.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mjpeg b/tests/ref/vsynth2/mjpeg
index ef2902b17f..cf5c424c4e 100644
--- a/tests/ref/vsynth2/mjpeg
+++ b/tests/ref/vsynth2/mjpeg
@@ -1,4 +1,4 @@
-765b2637f313eda33afdcdc384bfbc06 *./tests/data/a-mjpeg.avi
-704100 ./tests/data/a-mjpeg.avi
+765b2637f313eda33afdcdc384bfbc06 *./tests/data/vsynth2/mjpeg.avi
+704100 ./tests/data/vsynth2/mjpeg.avi
3dc419bf8ddc7482d811e4c9dcf9d418 *./tests/data/mjpeg.vsynth2.out.yuv
stddev: 4.38 PSNR: 35.29 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg b/tests/ref/vsynth2/mpeg
index dcf24e4d84..1f995eb0f3 100644
--- a/tests/ref/vsynth2/mpeg
+++ b/tests/ref/vsynth2/mpeg
@@ -1,4 +1,4 @@
-73ca6f1deab02d1d67a0e8495c026a9e *./tests/data/a-mpeg1.mpg
-192783 ./tests/data/a-mpeg1.mpg
+73ca6f1deab02d1d67a0e8495c026a9e *./tests/data/vsynth2/mpeg1.mpg
+192783 ./tests/data/vsynth2/mpeg1.mpg
56147e94b12f08df7213e610e177823d *./tests/data/mpeg.vsynth2.out.yuv
stddev: 4.95 PSNR: 34.22 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg1b b/tests/ref/vsynth2/mpeg1b
index 8a993b739d..a9a55a7b46 100644
--- a/tests/ref/vsynth2/mpeg1b
+++ b/tests/ref/vsynth2/mpeg1b
@@ -1,4 +1,4 @@
-977f3caf286e8f36c6ab4c7464632f26 *./tests/data/a-mpeg1b.mpg
-229806 ./tests/data/a-mpeg1b.mpg
+977f3caf286e8f36c6ab4c7464632f26 *./tests/data/vsynth2/mpeg1b.mpg
+229806 ./tests/data/vsynth2/mpeg1b.mpg
f41c60846bfb8cb6dcf6071c846c82b4 *./tests/data/mpeg1b.vsynth2.out.yuv
stddev: 4.13 PSNR: 35.80 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg2 b/tests/ref/vsynth2/mpeg2
index 31aebcb18b..f587967e5a 100644
--- a/tests/ref/vsynth2/mpeg2
+++ b/tests/ref/vsynth2/mpeg2
@@ -1,20 +1,20 @@
-2d55ce623a7be4e8136f80266e487678 *./tests/data/a-mpeg2.mpg
-198667 ./tests/data/a-mpeg2.mpg
+2d55ce623a7be4e8136f80266e487678 *./tests/data/vsynth2/mpeg2.mpg
+198667 ./tests/data/vsynth2/mpeg2.mpg
b7cae8a1f751b821cddcbe4d5dbc518c *./tests/data/mpeg2.vsynth2.out.yuv
stddev: 4.96 PSNR: 34.20 bytes: 7603200/ 7603200
-788b83a7c8c6c1e648c05076dd40dc30 *./tests/data/a-mpeg2ivlc-qprd.mpg
-247161 ./tests/data/a-mpeg2ivlc-qprd.mpg
+788b83a7c8c6c1e648c05076dd40dc30 *./tests/data/vsynth2/mpeg2ivlc-qprd.mpg
+247161 ./tests/data/vsynth2/mpeg2ivlc-qprd.mpg
cc6f08c1a24b58c19de325e79cfa40a3 *./tests/data/mpeg2.vsynth2.out.yuv
stddev: 4.25 PSNR: 35.56 bytes: 7603200/ 7603200
-a144ff5d9b293b43fc13ec40119925c0 *./tests/data/a-mpeg2_422.mpg
-359045 ./tests/data/a-mpeg2_422.mpg
+a144ff5d9b293b43fc13ec40119925c0 *./tests/data/vsynth2/mpeg2_422.mpg
+359045 ./tests/data/vsynth2/mpeg2_422.mpg
5e7a85daf29ae185499cacab2b39c17f *./tests/data/mpeg2.vsynth2.out.yuv
stddev: 54.55 PSNR: 13.39 bytes: 10137600/ 7603200
-f979bcca866e6e4cad5dc6cb06e56cfb *./tests/data/a-mpeg2.mpg
-198041 ./tests/data/a-mpeg2.mpg
+f979bcca866e6e4cad5dc6cb06e56cfb *./tests/data/vsynth2/mpeg2.mpg
+198041 ./tests/data/vsynth2/mpeg2.mpg
f6d9bf24ff8676a7f6076c05cd2c81a3 *./tests/data/mpeg2.vsynth2.out.yuv
stddev: 4.97 PSNR: 34.19 bytes: 7603200/ 7603200
-f90197a8b6e62ae25f82625337f27240 *./tests/data/a-mpeg2i.mpg
-204579 ./tests/data/a-mpeg2i.mpg
+f90197a8b6e62ae25f82625337f27240 *./tests/data/vsynth2/mpeg2i.mpg
+204579 ./tests/data/vsynth2/mpeg2i.mpg
ea5057b60146c06d40449cdfc686bf13 *./tests/data/mpeg2.vsynth2.out.yuv
stddev: 4.98 PSNR: 34.18 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg2thread b/tests/ref/vsynth2/mpeg2thread
index 18d856d825..b97ae47cc7 100644
--- a/tests/ref/vsynth2/mpeg2thread
+++ b/tests/ref/vsynth2/mpeg2thread
@@ -1,12 +1,12 @@
-c346717be44450e41d9d6e07f59d1490 *./tests/data/a-mpeg2thread.mpg
-182959 ./tests/data/a-mpeg2thread.mpg
+c346717be44450e41d9d6e07f59d1490 *./tests/data/vsynth2/mpeg2thread.mpg
+182959 ./tests/data/vsynth2/mpeg2thread.mpg
02b85a7f67ced2d146a5c4e8000712b6 *./tests/data/mpeg2thread.vsynth2.out.yuv
stddev: 4.75 PSNR: 34.58 bytes: 7603200/ 7603200
-ff30b3df75626398873ac4f30093a5ae *./tests/data/a-mpeg2threadivlc.mpg
-182105 ./tests/data/a-mpeg2threadivlc.mpg
+ff30b3df75626398873ac4f30093a5ae *./tests/data/vsynth2/mpeg2threadivlc.mpg
+182105 ./tests/data/vsynth2/mpeg2threadivlc.mpg
02b85a7f67ced2d146a5c4e8000712b6 *./tests/data/mpeg2thread.vsynth2.out.yuv
stddev: 4.75 PSNR: 34.58 bytes: 7603200/ 7603200
-3942f86a6aa6fe5aea586fedf210e33e *./tests/data/a-mpeg2reuse.mpg
-394265 ./tests/data/a-mpeg2reuse.mpg
+3942f86a6aa6fe5aea586fedf210e33e *./tests/data/vsynth2/mpeg2reuse.mpg
+394265 ./tests/data/vsynth2/mpeg2reuse.mpg
afbc483eaa769925259e6094cfda2c72 *./tests/data/mpeg2thread.vsynth2.out.yuv
stddev: 4.76 PSNR: 34.57 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg4 b/tests/ref/vsynth2/mpeg4
index af21592878..c24cbd0d86 100644
--- a/tests/ref/vsynth2/mpeg4
+++ b/tests/ref/vsynth2/mpeg4
@@ -1,4 +1,4 @@
-47de227982e77830a2db278214a08773 *./tests/data/a-odivx.mp4
-119797 ./tests/data/a-odivx.mp4
+47de227982e77830a2db278214a08773 *./tests/data/vsynth2/odivx.mp4
+119797 ./tests/data/vsynth2/odivx.mp4
90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv
stddev: 5.34 PSNR: 33.57 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg4adv b/tests/ref/vsynth2/mpeg4adv
index 4f37a5f094..958baea7e2 100644
--- a/tests/ref/vsynth2/mpeg4adv
+++ b/tests/ref/vsynth2/mpeg4adv
@@ -1,16 +1,16 @@
-dee7be19486a76d96c88d18eefba8f86 *./tests/data/a-mpeg4-adv.avi
-141546 ./tests/data/a-mpeg4-adv.avi
+dee7be19486a76d96c88d18eefba8f86 *./tests/data/vsynth2/mpeg4-adv.avi
+141546 ./tests/data/vsynth2/mpeg4-adv.avi
3f3a21e9db85a9c0f7022f557a5374c1 *./tests/data/mpeg4adv.vsynth2.out.yuv
stddev: 4.94 PSNR: 34.25 bytes: 7603200/ 7603200
-e7a09631afd7b75c6a0544c365aadbe1 *./tests/data/a-mpeg4-qprd.avi
-233154 ./tests/data/a-mpeg4-qprd.avi
+e7a09631afd7b75c6a0544c365aadbe1 *./tests/data/vsynth2/mpeg4-qprd.avi
+233154 ./tests/data/vsynth2/mpeg4-qprd.avi
b5b5f761b63bbf5844085b03e0a76636 *./tests/data/mpeg4adv.vsynth2.out.yuv
stddev: 3.75 PSNR: 36.63 bytes: 7603200/ 7603200
-78c93c522b23bcc7f84f8b592b0191b6 *./tests/data/a-mpeg4-adap.avi
-200120 ./tests/data/a-mpeg4-adap.avi
+78c93c522b23bcc7f84f8b592b0191b6 *./tests/data/vsynth2/mpeg4-adap.avi
+200120 ./tests/data/vsynth2/mpeg4-adap.avi
fd7db0b14fa76d0734bbfa36dbb513f8 *./tests/data/mpeg4adv.vsynth2.out.yuv
stddev: 3.78 PSNR: 36.58 bytes: 7603200/ 7603200
-a5150067914ee1dee50f8fc8dcaee841 *./tests/data/a-mpeg4-Q.avi
-165802 ./tests/data/a-mpeg4-Q.avi
+a5150067914ee1dee50f8fc8dcaee841 *./tests/data/vsynth2/mpeg4-Q.avi
+165802 ./tests/data/vsynth2/mpeg4-Q.avi
4dcc71ad79bee90777cf5299044be362 *./tests/data/mpeg4adv.vsynth2.out.yuv
stddev: 4.00 PSNR: 36.09 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg4nr b/tests/ref/vsynth2/mpeg4nr
index 0b4c443158..1f9499fc73 100644
--- a/tests/ref/vsynth2/mpeg4nr
+++ b/tests/ref/vsynth2/mpeg4nr
@@ -1,4 +1,4 @@
-c41187c99588fb7229ad330b2f80d28b *./tests/data/a-mpeg4-nr.avi
-155044 ./tests/data/a-mpeg4-nr.avi
+c41187c99588fb7229ad330b2f80d28b *./tests/data/vsynth2/mpeg4-nr.avi
+155044 ./tests/data/vsynth2/mpeg4-nr.avi
f7fc191308679f709405e62271f5c65f *./tests/data/mpeg4nr.vsynth2.out.yuv
stddev: 4.73 PSNR: 34.63 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/mpeg4thread b/tests/ref/vsynth2/mpeg4thread
index a789a9ec52..62bc5e917e 100644
--- a/tests/ref/vsynth2/mpeg4thread
+++ b/tests/ref/vsynth2/mpeg4thread
@@ -1,4 +1,4 @@
-8496ffe953dc3398c657d99e962e4d77 *./tests/data/a-mpeg4-thread.avi
-250162 ./tests/data/a-mpeg4-thread.avi
+8496ffe953dc3398c657d99e962e4d77 *./tests/data/vsynth2/mpeg4-thread.avi
+250162 ./tests/data/vsynth2/mpeg4-thread.avi
58165c879707aedeab460bab86dae4ef *./tests/data/mpeg4thread.vsynth2.out.yuv
stddev: 3.73 PSNR: 36.68 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/msmpeg4 b/tests/ref/vsynth2/msmpeg4
index ab5aed9d92..d77a4549ed 100644
--- a/tests/ref/vsynth2/msmpeg4
+++ b/tests/ref/vsynth2/msmpeg4
@@ -1,4 +1,4 @@
-3069f95f2ffca1f20c8ea36e2625fabc *./tests/data/a-msmpeg4.avi
-127680 ./tests/data/a-msmpeg4.avi
+3069f95f2ffca1f20c8ea36e2625fabc *./tests/data/vsynth2/msmpeg4.avi
+127680 ./tests/data/vsynth2/msmpeg4.avi
0e1c6e25c71c6a8fa8e506e3d97ca4c9 *./tests/data/msmpeg4.vsynth2.out.yuv
stddev: 5.33 PSNR: 33.59 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/msmpeg4v2 b/tests/ref/vsynth2/msmpeg4v2
index c96d1b7e47..3bfd83934c 100644
--- a/tests/ref/vsynth2/msmpeg4v2
+++ b/tests/ref/vsynth2/msmpeg4v2
@@ -1,4 +1,4 @@
-c09815e40a9d260628e1ebad8b2b3774 *./tests/data/a-msmpeg4v2.avi
-129918 ./tests/data/a-msmpeg4v2.avi
+c09815e40a9d260628e1ebad8b2b3774 *./tests/data/vsynth2/msmpeg4v2.avi
+129918 ./tests/data/vsynth2/msmpeg4v2.avi
8920194f8bf8f9cdd6c65b3df9e1a292 *./tests/data/msmpeg4v2.vsynth2.out.yuv
stddev: 5.33 PSNR: 33.59 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/rc b/tests/ref/vsynth2/rc
index 268333495f..1f4f979c79 100644
--- a/tests/ref/vsynth2/rc
+++ b/tests/ref/vsynth2/rc
@@ -1,4 +1,4 @@
-b517389e425d3065ab26ef4cc0658237 *./tests/data/a-mpeg4-rc.avi
-227762 ./tests/data/a-mpeg4-rc.avi
+b517389e425d3065ab26ef4cc0658237 *./tests/data/vsynth2/mpeg4-rc.avi
+227762 ./tests/data/vsynth2/mpeg4-rc.avi
cc947bbac9187bf08d3e2d425556aaa5 *./tests/data/rc.vsynth2.out.yuv
stddev: 4.26 PSNR: 35.54 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/roq b/tests/ref/vsynth2/roq
index 381dfd8921..f82f6409e2 100644
--- a/tests/ref/vsynth2/roq
+++ b/tests/ref/vsynth2/roq
@@ -1,4 +1,4 @@
-b46f899b2363065c60f3782ba1f8b7bd *./tests/data/a-roqav.roq
-92786 ./tests/data/a-roqav.roq
+b46f899b2363065c60f3782ba1f8b7bd *./tests/data/vsynth2/roqav.roq
+92786 ./tests/data/vsynth2/roqav.roq
e69fca960dd0911e9b8d589c13e11dc1 *./tests/data/roq.vsynth2.out.yuv
stddev: 3.81 PSNR: 36.49 bytes: 760320/ 7603200
diff --git a/tests/ref/vsynth2/rv10 b/tests/ref/vsynth2/rv10
index 0525b76f2f..c71d0dbbce 100644
--- a/tests/ref/vsynth2/rv10
+++ b/tests/ref/vsynth2/rv10
@@ -1,4 +1,4 @@
-b1467b0e8d8cad730e36d1e8ab49d573 *./tests/data/a-rv10.rm
-154310 ./tests/data/a-rv10.rm
+b1467b0e8d8cad730e36d1e8ab49d573 *./tests/data/vsynth2/rv10.rm
+154310 ./tests/data/vsynth2/rv10.rm
61213b91b359697ebcefb9e0a53ac54a *./tests/data/rv10.vsynth2.out.yuv
stddev: 5.43 PSNR: 33.42 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/rv20 b/tests/ref/vsynth2/rv20
index f83c47b2ea..d029e50374 100644
--- a/tests/ref/vsynth2/rv20
+++ b/tests/ref/vsynth2/rv20
@@ -1,4 +1,4 @@
-d864475aa16d84dd99de13e65003672a *./tests/data/a-rv20.rm
-132734 ./tests/data/a-rv20.rm
+d864475aa16d84dd99de13e65003672a *./tests/data/vsynth2/rv20.rm
+132734 ./tests/data/vsynth2/rv20.rm
c66afdcc0daac2f1b4167b9811968877 *./tests/data/rv20.vsynth2.out.yuv
stddev: 5.42 PSNR: 33.45 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/snow b/tests/ref/vsynth2/snow
index 8b351c6c6b..521d56388e 100644
--- a/tests/ref/vsynth2/snow
+++ b/tests/ref/vsynth2/snow
@@ -1,4 +1,4 @@
-af651d8ef0a66257ac8b2ef8b229f27b *./tests/data/a-snow.avi
-57700 ./tests/data/a-snow.avi
+af651d8ef0a66257ac8b2ef8b229f27b *./tests/data/vsynth2/snow.avi
+57700 ./tests/data/vsynth2/snow.avi
8890189af71a0dd3447c4e8424c9a76b *./tests/data/snow.vsynth2.out.yuv
stddev: 10.47 PSNR: 27.72 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/snowll b/tests/ref/vsynth2/snowll
index 838512b6a3..111a2f223d 100644
--- a/tests/ref/vsynth2/snowll
+++ b/tests/ref/vsynth2/snowll
@@ -1,4 +1,4 @@
-a8fccf278bbb17d37a756ecf11672b09 *./tests/data/a-snow53.avi
-2721758 ./tests/data/a-snow53.avi
+a8fccf278bbb17d37a756ecf11672b09 *./tests/data/vsynth2/snow53.avi
+2721758 ./tests/data/vsynth2/snow53.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/snowll.vsynth2.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/svq1 b/tests/ref/vsynth2/svq1
index 1b36bb6f0e..2a391c3ea5 100644
--- a/tests/ref/vsynth2/svq1
+++ b/tests/ref/vsynth2/svq1
@@ -1,4 +1,4 @@
-7f9fbe4890bc1df67867bf03803dca48 *./tests/data/a-svq1.mov
-766851 ./tests/data/a-svq1.mov
+7f9fbe4890bc1df67867bf03803dca48 *./tests/data/vsynth2/svq1.mov
+766851 ./tests/data/vsynth2/svq1.mov
aa03471dac3f49455a33a2b19fda1098 *./tests/data/svq1.vsynth2.out.yuv
stddev: 3.23 PSNR: 37.93 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/wmv1 b/tests/ref/vsynth2/wmv1
index 5935f556d0..3339a95e2b 100644
--- a/tests/ref/vsynth2/wmv1
+++ b/tests/ref/vsynth2/wmv1
@@ -1,4 +1,4 @@
-1011e26e7d351c96d7bbfe106d831b69 *./tests/data/a-wmv1.avi
-129530 ./tests/data/a-wmv1.avi
+1011e26e7d351c96d7bbfe106d831b69 *./tests/data/vsynth2/wmv1.avi
+129530 ./tests/data/vsynth2/wmv1.avi
81eee429b665254d19a06607463c0b5e *./tests/data/wmv1.vsynth2.out.yuv
stddev: 5.33 PSNR: 33.60 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/wmv2 b/tests/ref/vsynth2/wmv2
index 84c41793ec..61bb5a5c68 100644
--- a/tests/ref/vsynth2/wmv2
+++ b/tests/ref/vsynth2/wmv2
@@ -1,4 +1,4 @@
-1f6598e9776ed00aebdc44cc8d48cb7c *./tests/data/a-wmv2.avi
-129860 ./tests/data/a-wmv2.avi
+1f6598e9776ed00aebdc44cc8d48cb7c *./tests/data/vsynth2/wmv2.avi
+129860 ./tests/data/vsynth2/wmv2.avi
81eee429b665254d19a06607463c0b5e *./tests/data/wmv2.vsynth2.out.yuv
stddev: 5.33 PSNR: 33.60 bytes: 7603200/ 7603200