Place regression test output files in subdirs per family

Originally committed as revision 22155 to svn://svn.ffmpeg.org/ffmpeg/trunk

37 files changed, 94 insertions, 94 deletions

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