Merge tests Makefile into the top-level Makefile.

This gets rid of some recursion and simplifies the code.

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

9 files changed, 666 insertions, 683 deletions

diff --git a/Makefile b/Makefile
index a70d85ed19..eb740ca58b 100644
--- a/Makefile
+++ b/Makefile
@@ -214,11 +214,12 @@ clean:
 	$(MAKE) -C libavformat clean
 	$(MAKE) -C libpostproc clean
 	$(MAKE) -C libswscale  clean
-	$(MAKE) -C tests       clean
 	$(MAKE) -C vhook       clean
 	rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
 	   output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
 	rm -f doc/*.html doc/*.pod doc/*.1
+	rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
+	rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr))
 
 distclean: clean
 	$(MAKE) -C libavutil   distclean
@@ -226,7 +227,6 @@ distclean: clean
 	$(MAKE) -C libavformat distclean
 	$(MAKE) -C libpostproc distclean
 	$(MAKE) -C libswscale  distclean
-	$(MAKE) -C tests       distclean
 	$(MAKE) -C vhook       distclean
 	rm -f .depend version.h config.* *.pc
 
@@ -235,11 +235,69 @@ TAGS:
 
 # regression tests
 
-codectest libavtest seektest test-server fulltest test: $(PROGS)
-	$(MAKE) -C tests $@
+fulltest test: codectest libavtest seektest
+#codectest libavtest seektest test-server: $(PROGS)
+
+FFMPEG_REFFILE   = $(SRC_PATH)/tests/ffmpeg.regression.ref
+FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
+LIBAV_REFFILE    = $(SRC_PATH)/tests/libav.regression.ref
+ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref
+SEEK_REFFILE     = $(SRC_PATH)/tests/seek.regression.ref
+
+test-server: tests/vsynth1/00.pgm tests/asynth1.sw
+	@echo
+	@echo "Unfortunately ffserver is broken and therefore its regression"
+	@echo "test fails randomly. Treat the results accordingly."
+	@echo
+	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
+
+codectest mpeg4 mpeg ac3 snow snowll: tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw tests/tiny_psnr$(EXESUF)
+	$(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE)   tests/vsynth1
+	$(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2
+
+ifeq ($(CONFIG_GPL),yes)
+libavtest: tests/vsynth1/00.pgm tests/asynth1.sw
+	$(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1
+seektest: tests/seek_test$(EXESUF)
+	$(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
+else
+libavtest seektest:
+	@echo
+	@echo "This test requires FFmpeg to be compiled with --enable-gpl."
+	@echo
+	@exit 1
+endif
+
+ifeq ($(CONFIG_SWSCALER),yes)
+test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
+swscale_error:
+	@echo
+	@echo "This regression test is incompatible with --enable-swscaler."
+	@echo
+	@exit 1
+endif
+
+tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
+	mkdir -p tests/vsynth1
+	$(BUILD_ROOT)/$< 'tests/vsynth1/'
+
+tests/vsynth2/00.pgm: tests/rotozoom$(EXESUF)
+	mkdir -p tests/vsynth2
+	$(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
+
+tests/asynth1.sw: tests/audiogen$(EXESUF)
+	$(BUILD_ROOT)/$< $@
+
+%$(EXESUF): %.c
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+
+tests/seek_test$(EXESUF): tests/seek_test.c
+	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS)
+
 
 .PHONY: all lib videohook documentation install* wininstaller uninstall*
 .PHONY: dep depend clean distclean TAGS
 .PHONY: codectest libavtest seektest test-server fulltest test
+.PHONY: mpeg4 mpeg ac3 snow snowll swscale-error
 
 -include .depend
diff --git a/tests/Makefile b/tests/Makefile
deleted file mode 100644
index fcb8390d10..0000000000
--- a/tests/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Makefile for tests
-# (c) 2002 Fabrice Bellard
-#
-include ../config.mak
-
-VPATH     = $(SRC_PATH_BARE)/tests
-SRC_DIR   = $(SRC_PATH)/tests
-BUILD_DIR = $(BUILD_ROOT)/tests
-CFLAGS = -O2 -Wall -g
-
-FFMPEG_REFFILE   = $(SRC_DIR)/ffmpeg.regression.ref
-FFSERVER_REFFILE = $(SRC_DIR)/ffserver.regression.ref
-LIBAV_REFFILE    = $(SRC_DIR)/libav.regression.ref
-ROTOZOOM_REFFILE = $(SRC_DIR)/rotozoom.regression.ref
-SEEK_REFFILE     = $(SRC_DIR)/seek.regression.ref
-
-all fulltest test: codectest libavtest seektest
-
-test-server: vsynth1/00.pgm asynth1.sw
-	@echo
-	@echo "Unfortunately ffserver is broken and therefore its regression"
-	@echo "test fails randomly. Treat the results accordingly."
-	@echo
-	$(SRC_DIR)/server-regression.sh $(FFSERVER_REFFILE) $(SRC_DIR)/test.conf
-
-codectest mpeg4 mpeg ac3 snow snowll: vsynth1/00.pgm vsynth2/00.pgm asynth1.sw tiny_psnr$(EXESUF)
-	$(SRC_DIR)/regression.sh $@ $(FFMPEG_REFFILE) vsynth1
-	$(SRC_DIR)/regression.sh $@ $(ROTOZOOM_REFFILE) vsynth2
-
-ifeq ($(CONFIG_GPL),yes)
-libavtest: vsynth1/00.pgm asynth1.sw
-	$(SRC_DIR)/regression.sh $@ $(LIBAV_REFFILE) vsynth1
-seektest: seek_test$(EXESUF)
-	$(SRC_DIR)/seek_test.sh $(SEEK_REFFILE)
-else
-libavtest seektest:
-	@echo
-	@echo "This test requires FFmpeg to be compiled with --enable-gpl."
-	@echo
-	@exit 1
-endif
-
-ifeq ($(CONFIG_SWSCALER),yes)
-test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
-swscale_error:
-	@echo
-	@echo "This regression test is incompatible with --enable-swscaler."
-	@echo
-	@exit 1
-endif
-
-vsynth1/00.pgm: videogen$(EXESUF)
-	mkdir -p vsynth1
-	$(BUILD_DIR)/$< 'vsynth1/'
-
-vsynth2/00.pgm: rotozoom$(EXESUF)
-	mkdir -p vsynth2
-	$(BUILD_DIR)/$< 'vsynth2/' $(SRC_DIR)/lena.pnm
-
-asynth1.sw: audiogen$(EXESUF)
-	$(BUILD_DIR)/$< $@
-
-%$(EXESUF): %.c
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
-
-seek_test$(EXESUF): seek_test.c
-	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -o $@ $< $(BUILD_ROOT)/libavformat/libavformat.a $(BUILD_ROOT)/libavcodec/libavcodec.a $(BUILD_ROOT)/libavutil/libavutil.a $(EXTRALIBS)
-
-distclean clean:
-	rm -rf vsynth1 vsynth2 data asynth1.sw *~
-	rm -f $(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr)
-
-.PHONY: all fulltest test codectest libavtest test-server seektest
-.PHONY: mpeg4 mpeg ac3 snow snowll swscale_error distclean clean
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index ae53554068..127e254d70 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -1,198 +1,198 @@
 ffmpeg regression test
-dd4c189859399f7f251876be8e26e4f3 *./data/a-mpeg1.mpg
-722848 ./data/a-mpeg1.mpg
-78d202830e5ce5a67495ab14ebe6469e *./data/out.yuv
+dd4c189859399f7f251876be8e26e4f3 *./tests/data/a-mpeg1.mpg
+722848 ./tests/data/a-mpeg1.mpg
+78d202830e5ce5a67495ab14ebe6469e *./tests/data/out.yuv
 stddev:  7.65 PSNR:30.44 bytes:7602176
-f3b008355f68394b6cad694f3488ea2b *./data/a-mpeg2.mpg
-736978 ./data/a-mpeg2.mpg
-9f364a477987c3b14412e303b94377ca *./data/out.yuv
+f3b008355f68394b6cad694f3488ea2b *./tests/data/a-mpeg2.mpg
+736978 ./tests/data/a-mpeg2.mpg
+9f364a477987c3b14412e303b94377ca *./tests/data/out.yuv
 stddev:  7.68 PSNR:30.41 bytes:7602176
-1716f466ea82b4d90677868b2ce1f8e2 *./data/a-mpeg2ivlc-qprd.mpg
-708232 ./data/a-mpeg2ivlc-qprd.mpg
-40746946d5661606f7a649c62b6c4bee *./data/out.yuv
+1716f466ea82b4d90677868b2ce1f8e2 *./tests/data/a-mpeg2ivlc-qprd.mpg
+708232 ./tests/data/a-mpeg2ivlc-qprd.mpg
+40746946d5661606f7a649c62b6c4bee *./tests/data/out.yuv
 stddev: 12.21 PSNR:26.38 bytes:7602176
-2566ea5760247a9485c8281cb52291a8 *./data/a-mpeg2.mpg
-735853 ./data/a-mpeg2.mpg
-55c22a09e4924977ee2cc4180078d3ae *./data/out.yuv
+2566ea5760247a9485c8281cb52291a8 *./tests/data/a-mpeg2.mpg
+735853 ./tests/data/a-mpeg2.mpg
+55c22a09e4924977ee2cc4180078d3ae *./tests/data/out.yuv
 stddev:  7.67 PSNR:30.42 bytes:7602176
-0093ab9141105dec8dc4452ba8f0ab6f *./data/a-mpeg2i.mpg
-749746 ./data/a-mpeg2i.mpg
-5189af71e6aa96cc2f6452e7f6b29287 *./data/out.yuv
+0093ab9141105dec8dc4452ba8f0ab6f *./tests/data/a-mpeg2i.mpg
+749746 ./tests/data/a-mpeg2i.mpg
+5189af71e6aa96cc2f6452e7f6b29287 *./tests/data/out.yuv
 stddev:  7.68 PSNR:30.41 bytes:7602176
-69576facff13d45171e3a6c53b8018c4 *./data/a-mpeg2thread.mpg
-813459 ./data/a-mpeg2thread.mpg
-c0e8cbde76ff8377494fe6843fd03e11 *./data/out.yuv
+69576facff13d45171e3a6c53b8018c4 *./tests/data/a-mpeg2thread.mpg
+813459 ./tests/data/a-mpeg2thread.mpg
+c0e8cbde76ff8377494fe6843fd03e11 *./tests/data/out.yuv
 stddev:  7.63 PSNR:30.47 bytes:7602176
-17af99d1a7fc391242a809b0782263af *./data/a-mpeg2threadivlc.mpg
-803833 ./data/a-mpeg2threadivlc.mpg
-c0e8cbde76ff8377494fe6843fd03e11 *./data/out.yuv
+17af99d1a7fc391242a809b0782263af *./tests/data/a-mpeg2threadivlc.mpg
+803833 ./tests/data/a-mpeg2threadivlc.mpg
+c0e8cbde76ff8377494fe6843fd03e11 *./tests/data/out.yuv
 stddev:  7.63 PSNR:30.47 bytes:7602176
-c8d8b07b5fa97e0affb4a52d4d30a2b6 *./data/a-mpeg2reuse.mpg
-2102956 ./data/a-mpeg2reuse.mpg
-75d3dfc8133f0122cb9e272a21bc8c5c *./data/out.yuv
+c8d8b07b5fa97e0affb4a52d4d30a2b6 *./tests/data/a-mpeg2reuse.mpg
+2102956 ./tests/data/a-mpeg2reuse.mpg
+75d3dfc8133f0122cb9e272a21bc8c5c *./tests/data/out.yuv
 stddev:  7.67 PSNR:30.42 bytes:7602176
-c83ae8d8f3e2b4506df58e6a2f7e3b2a *./data/a-msmpeg4v2.avi
-636512 ./data/a-msmpeg4v2.avi
-279c33c2f6f58b7eb3d2daaa87160cb5 *./data/out.yuv
+c83ae8d8f3e2b4506df58e6a2f7e3b2a *./tests/data/a-msmpeg4v2.avi
+636512 ./tests/data/a-msmpeg4v2.avi
+279c33c2f6f58b7eb3d2daaa87160cb5 *./tests/data/out.yuv
 stddev:  8.00 PSNR:30.06 bytes:7602176
-f546e8d0ada1917bc470584477f83e0e *./data/a-msmpeg4.avi
-639406 ./data/a-msmpeg4.avi
-8692a2e9ddb8081c4f00cb1557e2388e *./data/out.yuv
+f546e8d0ada1917bc470584477f83e0e *./tests/data/a-msmpeg4.avi
+639406 ./tests/data/a-msmpeg4.avi
+8692a2e9ddb8081c4f00cb1557e2388e *./tests/data/out.yuv
 stddev:  8.00 PSNR:30.05 bytes:7602176
-44c11ce4aa20af1aa609f68e544e5479 *./data/a-wmv1.avi
-641448 ./data/a-wmv1.avi
-69454f78ca636e83a600834e5a90660e *./data/out.yuv
+44c11ce4aa20af1aa609f68e544e5479 *./tests/data/a-wmv1.avi
+641448 ./tests/data/a-wmv1.avi
+69454f78ca636e83a600834e5a90660e *./tests/data/out.yuv
 stddev:  8.01 PSNR:30.04 bytes:7602176
-044b1b5bd5899d54a8fe09eac2181d8b *./data/a-wmv2.avi
-675342 ./data/a-wmv2.avi
-69454f78ca636e83a600834e5a90660e *./data/out.yuv
+044b1b5bd5899d54a8fe09eac2181d8b *./tests/data/a-wmv2.avi
+675342 ./tests/data/a-wmv2.avi
+69454f78ca636e83a600834e5a90660e *./tests/data/out.yuv
 stddev:  8.01 PSNR:30.04 bytes:7602176
-12d215719748b4cf1adeaca4e519ba6c *./data/a-h261.avi
-727616 ./data/a-h261.avi
-bb2e71de01899ade4f850c180f9b0258 *./data/out.yuv
+12d215719748b4cf1adeaca4e519ba6c *./tests/data/a-h261.avi
+727616 ./tests/data/a-h261.avi
+bb2e71de01899ade4f850c180f9b0258 *./tests/data/out.yuv
 stddev:  9.13 PSNR:28.90 bytes:7602176
-66d36048d15c3b04bd7bfc08ab977fae *./data/a-h263.avi
-673694 ./data/a-h263.avi
-d507be4253a9c8211a3738c58ba28118 *./data/out.yuv
+66d36048d15c3b04bd7bfc08ab977fae *./tests/data/a-h263.avi
+673694 ./tests/data/a-h263.avi
+d507be4253a9c8211a3738c58ba28118 *./tests/data/out.yuv
 stddev:  8.06 PSNR:29.99 bytes:7602176
-e9e884a7c6b77d1aeeb4cb56ac150f92 *./data/a-h263p.avi
-2389564 ./data/a-h263p.avi
-0bb16a352798c997cb36e167f4fa8f3c *./data/out.yuv
+e9e884a7c6b77d1aeeb4cb56ac150f92 *./tests/data/a-h263p.avi
+2389564 ./tests/data/a-h263p.avi
+0bb16a352798c997cb36e167f4fa8f3c *./tests/data/out.yuv
 stddev:  2.07 PSNR:41.77 bytes:7602176
-3ee2dd25f141d520f61e5c01d08bdef1 *./data/a-odivx.mp4
-550787 ./data/a-odivx.mp4
-a1c691f3be526ecbf3be3152d5bab88c *./data/out.yuv
+3ee2dd25f141d520f61e5c01d08bdef1 *./tests/data/a-odivx.mp4
+550787 ./tests/data/a-odivx.mp4
+a1c691f3be526ecbf3be3152d5bab88c *./tests/data/out.yuv
 stddev:  7.99 PSNR:30.06 bytes:7602176
-6c58e5707afe056b072d2ce21b3b8e4f *./data/a-huffyuv.avi
-7933744 ./data/a-huffyuv.avi
-799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
+6c58e5707afe056b072d2ce21b3b8e4f *./tests/data/a-huffyuv.avi
+7933744 ./tests/data/a-huffyuv.avi
+799d3db687f6cdd7a837ec156efc171f *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-b27e911f1563455700c93e6ae39715ca *./data/a-mpeg4-rc.avi
-813988 ./data/a-mpeg4-rc.avi
-f57311745de96b6551c175679b138efc *./data/out.yuv
+b27e911f1563455700c93e6ae39715ca *./tests/data/a-mpeg4-rc.avi
+813988 ./tests/data/a-mpeg4-rc.avi
+f57311745de96b6551c175679b138efc *./tests/data/out.yuv
 stddev: 10.40 PSNR:27.78 bytes:7602176
-85e2456a673041d528b242d78318fb65 *./data/a-mpeg4-adv.avi
-600188 ./data/a-mpeg4-adv.avi
-60edc5a67271e425d0a2a52981895b81 *./data/out.yuv
+85e2456a673041d528b242d78318fb65 *./tests/data/a-mpeg4-adv.avi
+600188 ./tests/data/a-mpeg4-adv.avi
+60edc5a67271e425d0a2a52981895b81 *./tests/data/out.yuv
 stddev: 10.25 PSNR:27.91 bytes:7602176
-d099307d14c1a4daa145618ca0522888 *./data/a-mpeg4-qprd.avi
-657996 ./data/a-mpeg4-qprd.avi
-8a52c562082bad78cabb40ffa292ceec *./data/out.yuv
+d099307d14c1a4daa145618ca0522888 *./tests/data/a-mpeg4-qprd.avi
+657996 ./tests/data/a-mpeg4-qprd.avi
+8a52c562082bad78cabb40ffa292ceec *./tests/data/out.yuv
 stddev: 12.12 PSNR:26.44 bytes:7602176
-9192b10ae298ba325d53abf7b5b91ba3 *./data/a-mpeg4-adap.avi
-400650 ./data/a-mpeg4-adap.avi
-0ce1d1fbebc9e9178e1a1d4a32a5804c *./data/out.yuv
+9192b10ae298ba325d53abf7b5b91ba3 *./tests/data/a-mpeg4-adap.avi
+400650 ./tests/data/a-mpeg4-adap.avi
+0ce1d1fbebc9e9178e1a1d4a32a5804c *./tests/data/out.yuv
 stddev: 14.66 PSNR:24.80 bytes:7602176
-41b27141442f773eca9ef3d48d8d555a *./data/a-mpeg4-Q.avi
-878264 ./data/a-mpeg4-Q.avi
-8995abbcc97ed4767fcbc0bf46accd01 *./data/out.yuv
+41b27141442f773eca9ef3d48d8d555a *./tests/data/a-mpeg4-Q.avi
+878264 ./tests/data/a-mpeg4-Q.avi
+8995abbcc97ed4767fcbc0bf46accd01 *./tests/data/out.yuv
 stddev:  5.61 PSNR:33.13 bytes:7602176
-5fff534f0b958547dfdb811d4f289931 *./data/a-mpeg4-thread.avi
-761170 ./data/a-mpeg4-thread.avi
-fe1d119938f8a26174b38eeaa18dff85 *./data/out.yuv
+5fff534f0b958547dfdb811d4f289931 *./tests/data/a-mpeg4-thread.avi
+761170 ./tests/data/a-mpeg4-thread.avi
+fe1d119938f8a26174b38eeaa18dff85 *./tests/data/out.yuv
 stddev: 12.31 PSNR:26.31 bytes:7602176
-c1dae02bddd79790266bc0a9f7d6eb0e *./data/a-mpeg4-PSP.mp4
-406449 ./data/a-mpeg4-PSP.mp4
-7315281e07830456208dff61337c982b *./data/a-error-mpeg4-adv.avi
-731526 ./data/a-error-mpeg4-adv.avi
-6ce2c82a0a9cf67a6991694473e9a306 *./data/out.yuv
+c1dae02bddd79790266bc0a9f7d6eb0e *./tests/data/a-mpeg4-PSP.mp4
+406449 ./tests/data/a-mpeg4-PSP.mp4
+7315281e07830456208dff61337c982b *./tests/data/a-error-mpeg4-adv.avi
+731526 ./tests/data/a-error-mpeg4-adv.avi
+6ce2c82a0a9cf67a6991694473e9a306 *./tests/data/out.yuv
 stddev: 18.23 PSNR:22.90 bytes:7602176
-b699b2fd005571dda3f8d34cb0ce7aec *./data/a-mpeg4-nr.avi
-688676 ./data/a-mpeg4-nr.avi
-2c16e13b1367022d52b0e75d93a734ba *./data/out.yuv
+b699b2fd005571dda3f8d34cb0ce7aec *./tests/data/a-mpeg4-nr.avi
+688676 ./tests/data/a-mpeg4-nr.avi
+2c16e13b1367022d52b0e75d93a734ba *./tests/data/out.yuv
 stddev:  7.02 PSNR:31.18 bytes:7602176
-225ab004f6ac16e5ade3b453f45b9d96 *./data/a-mpeg1b.mpg
-1026429 ./data/a-mpeg1b.mpg
-dd9a471c6b2d1004a90e42f34707becf *./data/out.yuv
+225ab004f6ac16e5ade3b453f45b9d96 *./tests/data/a-mpeg1b.mpg
+1026429 ./tests/data/a-mpeg1b.mpg
+dd9a471c6b2d1004a90e42f34707becf *./tests/data/out.yuv
 stddev:  6.34 PSNR:32.07 bytes:7602176
-2f9cb2ede35f7d12f6b518c50e20d81c *./data/a-mjpeg.avi
-1567580 ./data/a-mjpeg.avi
-18c3a76f984e717dd886d21fa04355f6 *./data/out.yuv
+2f9cb2ede35f7d12f6b518c50e20d81c *./tests/data/a-mjpeg.avi
+1567580 ./tests/data/a-mjpeg.avi
+18c3a76f984e717dd886d21fa04355f6 *./tests/data/out.yuv
 stddev:  7.93 PSNR:30.13 bytes:7602176
-5a662e3833d900b56cca79ba5ed5ec06 *./data/a-ljpeg.avi
-6264498 ./data/a-ljpeg.avi
-799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
+5a662e3833d900b56cca79ba5ed5ec06 *./tests/data/a-ljpeg.avi
+6264498 ./tests/data/a-ljpeg.avi
+799d3db687f6cdd7a837ec156efc171f *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-dca9d700da7857217408c310c501b9bc *./data/a-jpegls.avi
-9086676 ./data/a-jpegls.avi
-0f8637e9b861230aff9894825af83720 *./data/out.yuv
+dca9d700da7857217408c310c501b9bc *./tests/data/a-jpegls.avi
+9086676 ./tests/data/a-jpegls.avi
+0f8637e9b861230aff9894825af83720 *./tests/data/out.yuv
 stddev:  2.84 PSNR:39.04 bytes:7602176
-7eee6367442884321e27d15a26bc032a *./data/a-rv10.rm
-667915 ./data/a-rv10.rm
-d507be4253a9c8211a3738c58ba28118 *./data/out.yuv
+7eee6367442884321e27d15a26bc032a *./tests/data/a-rv10.rm
+667915 ./tests/data/a-rv10.rm
+d507be4253a9c8211a3738c58ba28118 *./tests/data/out.yuv
 stddev:  8.06 PSNR:29.99 bytes:7602176
-55c73229105f35cbb06ee0dda215df2f *./data/a-rv20.rm
-640856 ./data/a-rv20.rm
-297dc46da1a256c0a97158c036c30c7f *./data/out.yuv
+55c73229105f35cbb06ee0dda215df2f *./tests/data/a-rv20.rm
+640856 ./tests/data/a-rv20.rm
+297dc46da1a256c0a97158c036c30c7f *./tests/data/out.yuv
 stddev:  8.26 PSNR:29.77 bytes:7602176
-d13292f4583618d1b7b525a9ee010dff *./data/a-asv1.avi
-1488864 ./data/a-asv1.avi
-925320b74c7dfda5dc8378dd879ae2c3 *./data/out.yuv
+d13292f4583618d1b7b525a9ee010dff *./tests/data/a-asv1.avi
+1488864 ./tests/data/a-asv1.avi
+925320b74c7dfda5dc8378dd879ae2c3 *./tests/data/out.yuv
 stddev: 20.00 PSNR:22.10 bytes:7602176
-2e50b590f32bf98bde82dbfaf180007a *./data/a-asv2.avi
-1454536 ./data/a-asv2.avi
-0b310840a6d3970595983491687669df *./data/out.yuv
+2e50b590f32bf98bde82dbfaf180007a *./tests/data/a-asv2.avi
+1454536 ./tests/data/a-asv2.avi
+0b310840a6d3970595983491687669df *./tests/data/out.yuv
 stddev: 18.82 PSNR:22.63 bytes:7602176
-cbdb25fe5bb6a895baf9799b8ccb3038 *./data/a-flv.flv
-649040 ./data/a-flv.flv
-40281942d6ee254f7d3027b8593b19be *./data/out.yuv
+cbdb25fe5bb6a895baf9799b8ccb3038 *./tests/data/a-flv.flv
+649040 ./tests/data/a-flv.flv
+40281942d6ee254f7d3027b8593b19be *./tests/data/out.yuv
 stddev:  8.06 PSNR:29.99 bytes:7602176
-f8f51fa737add17f7fecaefa118b57ed *./data/a-ffv1.avi
-2654678 ./data/a-ffv1.avi
-799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
+f8f51fa737add17f7fecaefa118b57ed *./tests/data/a-ffv1.avi
+2654678 ./tests/data/a-ffv1.avi
+799d3db687f6cdd7a837ec156efc171f *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-9078723c943de5d79490f54b99e6ea9e *./data/a-snow.avi
-156656 ./data/a-snow.avi
-f2932084b52e2ede167c9ba21eae0656 *./data/out.yuv
+9078723c943de5d79490f54b99e6ea9e *./tests/data/a-snow.avi
+156656 ./tests/data/a-snow.avi
+f2932084b52e2ede167c9ba21eae0656 *./tests/data/out.yuv
 stddev: 23.14 PSNR:20.83 bytes:7602176
-ba999e86070aa971376e7f317a022c37 *./data/a-snow53.avi
-3519486 ./data/a-snow53.avi
-799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
+ba999e86070aa971376e7f317a022c37 *./tests/data/a-snow53.avi
+3519486 ./tests/data/a-snow53.avi
+799d3db687f6cdd7a837ec156efc171f *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-c299f64c3e85b928c5bfe71629cee006 *./data/a-dv.dv
-7200000 ./data/a-dv.dv
-3b9ead854b912e43ead976e4e86aab3b *./data/out.yuv
+c299f64c3e85b928c5bfe71629cee006 *./tests/data/a-dv.dv
+7200000 ./tests/data/a-dv.dv
+3b9ead854b912e43ead976e4e86aab3b *./tests/data/out.yuv
 stddev:  8.91 PSNR:29.12 bytes:7602176
-70dc9a58345e603094dedcac71e2dcd2 *./data/a-dv.dv
-14400000 ./data/a-dv.dv
-d727da8c7ce387ebe68845a1be916ee3 *./data/out.yuv
+70dc9a58345e603094dedcac71e2dcd2 *./tests/data/a-dv.dv
+14400000 ./tests/data/a-dv.dv
+d727da8c7ce387ebe68845a1be916ee3 *./tests/data/out.yuv
 stddev:  8.50 PSNR:29.52 bytes:7602176
-6860534864cad0de4b1af9f987aaf9bf *./data/a-svq1.mov
-1365791 ./data/a-svq1.mov
-fb0a97094a89d6f379535f615783d00c *./data/out.yuv
+6860534864cad0de4b1af9f987aaf9bf *./tests/data/a-svq1.mov
+1365791 ./tests/data/a-svq1.mov
+fb0a97094a89d6f379535f615783d00c *./tests/data/out.yuv
 stddev: 10.98 PSNR:27.30 bytes:7602176
-21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
-95712 ./data/a-mp2.mp2
-83f8df5d5f84480566af548bb037fceb *./data/out.wav
+21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
+95712 ./tests/data/a-mp2.mp2
+83f8df5d5f84480566af548bb037fceb *./tests/data/out.wav
 stddev:9330.70 PSNR:16.92 bytes:1054720
 stddev:4396.13 PSNR:23.46 bytes:1052672
-aefe11ab5067621a1c674859d6413891 *./data/a-ac3.rm
-98203 ./data/a-ac3.rm
-39878597b1d65cce473639a7d8c93b02 *./data/a-g726.wav
-24279 ./data/a-g726.wav
-888f2f016e608d044a1bacbca5497ed2 *./data/out.wav
+aefe11ab5067621a1c674859d6413891 *./tests/data/a-ac3.rm
+98203 ./tests/data/a-ac3.rm
+39878597b1d65cce473639a7d8c93b02 *./tests/data/a-g726.wav
+24279 ./tests/data/a-g726.wav
+888f2f016e608d044a1bacbca5497ed2 *./tests/data/out.wav
 stddev:8368.02 PSNR:17.87 bytes:96256
-de3f0e1f50b19bd8572fdd3dee2e72c4 *./data/a-adpcm_ima.wav
-266300 ./data/a-adpcm_ima.wav
-60178d48204f5662d91776e36eddc82e *./data/out.wav
+de3f0e1f50b19bd8572fdd3dee2e72c4 *./tests/data/a-adpcm_ima.wav
+266300 ./tests/data/a-adpcm_ima.wav
+60178d48204f5662d91776e36eddc82e *./tests/data/out.wav
 stddev:11441.89 PSNR:15.15 bytes:1054720
-628d4789cf9ee16a756ac54b7fd8650d *./data/a-adpcm_ms.wav
-267320 ./data/a-adpcm_ms.wav
-91a84bb4f319a3a0bf0c0441b3d3a529 *./data/out.wav
+628d4789cf9ee16a756ac54b7fd8650d *./tests/data/a-adpcm_ms.wav
+267320 ./tests/data/a-adpcm_ms.wav
+91a84bb4f319a3a0bf0c0441b3d3a529 *./tests/data/out.wav
 stddev:1050.18 PSNR:35.89 bytes:1054720
-ab11d9151644cbff27827b7e89f37aa9 *./data/a-adpcm_yam.wav
-264248 ./data/a-adpcm_yam.wav
-e92cec8c07913ffb91ad2b11f79cdc00 *./data/out.wav
+ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
+264248 ./tests/data/a-adpcm_yam.wav
+e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/out.wav
 stddev:18312.68 PSNR:11.06 bytes:1056768
-c3382f03ce2efb5d475240d288a33898 *./data/a-flac.flac
-353368 ./data/a-flac.flac
-c4228df189aad9567a037727d0e763e4 *./data/out.wav
+c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
+353368 ./tests/data/a-flac.flac
+c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav
 stddev: 33.31 PSNR:65.87 bytes:1040384
-0c406c4e4586ca27064e28637b662631 *./data/a-wmav1.asf
-106004 ./data/a-wmav1.asf
+0c406c4e4586ca27064e28637b662631 *./tests/data/a-wmav1.asf
+106004 ./tests/data/a-wmav1.asf
 stddev:12251.50 PSNR:14.56 bytes:1056768
 stddev:2106.00 PSNR:29.85 bytes:1048576
-82442aaa5fdbd327769e4c4ad369147e *./data/a-wmav2.asf
-106044 ./data/a-wmav2.asf
+82442aaa5fdbd327769e4c4ad369147e *./tests/data/a-wmav2.asf
+106044 ./tests/data/a-wmav2.asf
 stddev:12255.92 PSNR:14.55 bytes:1056768
 stddev:2099.31 PSNR:29.88 bytes:1048576
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 45297f7e9b..787f238642 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -1,117 +1,117 @@
 ffmpeg regression test
-8a0536ccfe36f4fff408b3327d33e1dd *./data/b-libav.avi
-340344 ./data/b-libav.avi
-./data/b-libav.avi CRC=0x400c29e9
-786446e80ead936e5faa8f5908f19281 *./data/b-libav.asf
-339775 ./data/b-libav.asf
-./data/b-libav.asf CRC=0x74113749
-1ce78eeb6881ffe5b649a9b5105de919 *./data/b-libav.rm
-355405 ./data/b-libav.rm
-bdb7484c68db722f66ba1630cf79844c *./data/b-libav.mpg
-378880 ./data/b-libav.mpg
-./data/b-libav.mpg CRC=0x2b71a386
-322d59758fe9446147223a607d1699bc *./data/b-libav.ts
-471692 ./data/b-libav.ts
-./data/b-libav.ts CRC=0xcc4948e1
-d6fdeb9f7083cc827f9510c6c4517dc0 *./data/b-libav.swf
-335771 ./data/b-libav.swf
-./data/b-libav.swf CRC=0xe14e8847
-a1cd7fff97d5e4c83f0d18a22d51c552 *./data/b-libav.ffm
-380928 ./data/b-libav.ffm
-./data/b-libav.ffm CRC=0x01522b4a
-f8ad5bd78f4d012a8ce9570aa395ac54 *./data/b-libav.flv
-335833 ./data/b-libav.flv
-./data/b-libav.flv CRC=0xe14e8847
-16518706f425cb537362bfc1c58b8de5 *./data/b-libav.mov
-366923 ./data/b-libav.mov
-./data/b-libav.mov CRC=0x45079dca
-7820fa85ab86c62028d8dbda94589573 *./data/b-libav.dv
-3600000 ./data/b-libav.dv
-./data/b-libav.dv CRC=0xf517e829
-feb04ba3cf4f607d5527664eb69ec72e *./data/b-libav.gxf
-814640 ./data/b-libav.gxf
-./data/b-libav.gxf CRC=0xa376c09e
-9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
- 317075 ./data/b-libav.pbm
-./data/b-libav.pbm CRC=0xb92906cb
-6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm
-2534775 ./data/b-libav.pgm
-./data/b-libav.pgm CRC=0xf4aa7c47
-0c5fe86621b7377705837f304d4ba1e9 *./data/b-libav.ppm
-7603575 ./data/b-libav.ppm
-./data/b-libav.ppm CRC=0xb2bb8e92
-88a98269295fbfce7816558ad84e1259 *./data/b-libav.gif
-2906382 ./data/b-libav.gif
-b977a4fedff90a79baf70c8e02986820 *./data/b-libav.y4m
-3801810 ./data/b-libav.y4m
-./data/b-libav%02d.pgm CRC=0x84c09106
-de216b43403f51e57e644fbf812568bf *./data/b-libav02.pgm
-./data/b-libav%02d.ppm CRC=0x25c06ecf
-86bbdb77afa289ff363120f8044f29df *./data/b-libav02.ppm
-./data/b-libav%02d.bmp CRC=0xf3a66ecf
-c3a9f333ddebff6eae3f4360bad2de29 *./data/b-libav02.bmp
-./data/b-libav%02d.tga CRC=0xf3a66ecf
-f558eef0740c4b247f1eb17e1dbf7adf *./data/b-libav02.tga
-./data/b-libav%02d.tiff CRC=0x25c06ecf
-3076b16ac0c8a39a796e69944f6a40dc *./data/b-libav02.tiff
-./data/b-libav%02d.sgi CRC=0x00000001
-c6cab058a2b0a33ee843bd096b280075 *./data/b-libav02.sgi
-./data/b-libav%02d.jpg CRC=0x62328baa
-5d6c53e5297c4485e26c25e37885376f *./data/b-libav02.jpg
-b0a8c8063d81921db5d7c8f50a1cc454 *./data/b-libav.wav
-  89132 ./data/b-libav.wav
-./data/b-libav.wav CRC=0x2a09519c
-e2a6d6fae17394dfe87cb5bb8ae11837 *./data/b-libav.al
-  44544 ./data/b-libav.al
-./data/b-libav.al CRC=0xefdf94c3
-4574d7e2c09e1e13663e61bd2889f12d *./data/b-libav.ul
-  44544 ./data/b-libav.ul
-./data/b-libav.ul CRC=0x6064b2f8
-7a21ff174e3cca1702e0826c4ca0eccf *./data/b-libav.au
-  89112 ./data/b-libav.au
-./data/b-libav.au CRC=0x2a09519c
-272b91d8fc31ed43b08246d182719751 *./data/b-libav.mmf
-  22609 ./data/b-libav.mmf
-./data/b-libav.mmf CRC=0x03633476
-ae3a23a7ea13c92a2909445ca8144dcd *./data/b-libav.aif
-89142 ./data/b-libav.aif
-./data/b-libav.aif CRC=0x2a09519c
-8d117c49d6b210abe783d1b0b897cec7 *./data/b-libav.voc
-  32768 ./data/b-libav.voc
-./data/b-libav.voc CRC=0x49972c8c
-ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv420p.yuv
- 304128 ./data/b-libav-yuv420p.yuv
-ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv422p.yuv
- 304128 ./data/b-libav-yuv422p.yuv
-ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv444p.yuv
- 304128 ./data/b-libav-yuv444p.yuv
-ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuyv422.yuv
- 304128 ./data/b-libav-yuyv422.yuv
-545f61c353a8b4419808785cb4f0069d *./data/b-libav-yuv410p.yuv
- 304128 ./data/b-libav-yuv410p.yuv
-d6c03f930018ff859bd43f52b92e9321 *./data/b-libav-yuv411p.yuv
- 304128 ./data/b-libav-yuv411p.yuv
-14117c4d7956775a7bbceabfc38da808 *./data/b-libav-yuvj420p.yuv
- 304128 ./data/b-libav-yuvj420p.yuv
-14117c4d7956775a7bbceabfc38da808 *./data/b-libav-yuvj422p.yuv
- 304128 ./data/b-libav-yuvj422p.yuv
-14117c4d7956775a7bbceabfc38da808 *./data/b-libav-yuvj444p.yuv
- 304128 ./data/b-libav-yuvj444p.yuv
-deb2f7ebe297df2c1fe264d19b34d2fb *./data/b-libav-rgb24.yuv
- 304128 ./data/b-libav-rgb24.yuv
-deb2f7ebe297df2c1fe264d19b34d2fb *./data/b-libav-bgr24.yuv
- 304128 ./data/b-libav-bgr24.yuv
-deb2f7ebe297df2c1fe264d19b34d2fb *./data/b-libav-rgb32.yuv
- 304128 ./data/b-libav-rgb32.yuv
-5d395f62bff8ac475f743268c772ca3a *./data/b-libav-rgb565.yuv
- 304128 ./data/b-libav-rgb565.yuv
-2ffd6871fcbfe9570454e8703ac8ea01 *./data/b-libav-rgb555.yuv
- 304128 ./data/b-libav-rgb555.yuv
-0b62dcf9b57b294dbaa5d9e99b1ee192 *./data/b-libav-gray.yuv
- 304128 ./data/b-libav-gray.yuv
-e197450dae2feba9e757b551e1e9145c *./data/b-libav-monow.yuv
- 304128 ./data/b-libav-monow.yuv
-e197450dae2feba9e757b551e1e9145c *./data/b-libav-monob.yuv
- 304128 ./data/b-libav-monob.yuv
-7a319375916cae4e691ecb74295e5d2a *./data/b-libav-pal8.yuv
- 304128 ./data/b-libav-pal8.yuv
+8a0536ccfe36f4fff408b3327d33e1dd *./tests/data/b-libav.avi
+340344 ./tests/data/b-libav.avi
+./tests/data/b-libav.avi CRC=0x400c29e9
+786446e80ead936e5faa8f5908f19281 *./tests/data/b-libav.asf
+339775 ./tests/data/b-libav.asf
+./tests/data/b-libav.asf CRC=0x74113749
+1ce78eeb6881ffe5b649a9b5105de919 *./tests/data/b-libav.rm
+355405 ./tests/data/b-libav.rm
+bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg
+378880 ./tests/data/b-libav.mpg
+./tests/data/b-libav.mpg CRC=0x2b71a386
+322d59758fe9446147223a607d1699bc *./tests/data/b-libav.ts
+471692 ./tests/data/b-libav.ts
+./tests/data/b-libav.ts CRC=0xcc4948e1
+d6fdeb9f7083cc827f9510c6c4517dc0 *./tests/data/b-libav.swf
+335771 ./tests/data/b-libav.swf
+./tests/data/b-libav.swf CRC=0xe14e8847
+a1cd7fff97d5e4c83f0d18a22d51c552 *./tests/data/b-libav.ffm
+380928 ./tests/data/b-libav.ffm
+./tests/data/b-libav.ffm CRC=0x01522b4a
+f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv
+335833 ./tests/data/b-libav.flv
+./tests/data/b-libav.flv CRC=0xe14e8847
+16518706f425cb537362bfc1c58b8de5 *./tests/data/b-libav.mov
+366923 ./tests/data/b-libav.mov
+./tests/data/b-libav.mov CRC=0x45079dca
+7820fa85ab86c62028d8dbda94589573 *./tests/data/b-libav.dv
+3600000 ./tests/data/b-libav.dv
+./tests/data/b-libav.dv CRC=0xf517e829
+feb04ba3cf4f607d5527664eb69ec72e *./tests/data/b-libav.gxf
+814640 ./tests/data/b-libav.gxf
+./tests/data/b-libav.gxf CRC=0xa376c09e
+9a9da315747599f7718cc9a9a09c21ff *./tests/data/b-libav.pbm
+ 317075 ./tests/data/b-libav.pbm
+./tests/data/b-libav.pbm CRC=0xb92906cb
+6ea0e1faf08f6fcdb44db4a104361b57 *./tests/data/b-libav.pgm
+2534775 ./tests/data/b-libav.pgm
+./tests/data/b-libav.pgm CRC=0xf4aa7c47
+0c5fe86621b7377705837f304d4ba1e9 *./tests/data/b-libav.ppm
+7603575 ./tests/data/b-libav.ppm
+./tests/data/b-libav.ppm CRC=0xb2bb8e92
+88a98269295fbfce7816558ad84e1259 *./tests/data/b-libav.gif
+2906382 ./tests/data/b-libav.gif
+b977a4fedff90a79baf70c8e02986820 *./tests/data/b-libav.y4m
+3801810 ./tests/data/b-libav.y4m
+./tests/data/b-libav%02d.pgm CRC=0x84c09106
+de216b43403f51e57e644fbf812568bf *./tests/data/b-libav02.pgm
+./tests/data/b-libav%02d.ppm CRC=0x25c06ecf
+86bbdb77afa289ff363120f8044f29df *./tests/data/b-libav02.ppm
+./tests/data/b-libav%02d.bmp CRC=0xf3a66ecf
+c3a9f333ddebff6eae3f4360bad2de29 *./tests/data/b-libav02.bmp
+./tests/data/b-libav%02d.tga CRC=0xf3a66ecf
+f558eef0740c4b247f1eb17e1dbf7adf *./tests/data/b-libav02.tga
+./tests/data/b-libav%02d.tiff CRC=0x25c06ecf
+3076b16ac0c8a39a796e69944f6a40dc *./tests/data/b-libav02.tiff
+./tests/data/b-libav%02d.sgi CRC=0x00000001
+c6cab058a2b0a33ee843bd096b280075 *./tests/data/b-libav02.sgi
+./tests/data/b-libav%02d.jpg CRC=0x62328baa
+5d6c53e5297c4485e26c25e37885376f *./tests/data/b-libav02.jpg
+b0a8c8063d81921db5d7c8f50a1cc454 *./tests/data/b-libav.wav
+  89132 ./tests/data/b-libav.wav
+./tests/data/b-libav.wav CRC=0x2a09519c
+e2a6d6fae17394dfe87cb5bb8ae11837 *./tests/data/b-libav.al
+  44544 ./tests/data/b-libav.al
+./tests/data/b-libav.al CRC=0xefdf94c3
+4574d7e2c09e1e13663e61bd2889f12d *./tests/data/b-libav.ul
+  44544 ./tests/data/b-libav.ul
+./tests/data/b-libav.ul CRC=0x6064b2f8
+7a21ff174e3cca1702e0826c4ca0eccf *./tests/data/b-libav.au
+  89112 ./tests/data/b-libav.au
+./tests/data/b-libav.au CRC=0x2a09519c
+272b91d8fc31ed43b08246d182719751 *./tests/data/b-libav.mmf
+  22609 ./tests/data/b-libav.mmf
+./tests/data/b-libav.mmf CRC=0x03633476
+ae3a23a7ea13c92a2909445ca8144dcd *./tests/data/b-libav.aif
+89142 ./tests/data/b-libav.aif
+./tests/data/b-libav.aif CRC=0x2a09519c
+8d117c49d6b210abe783d1b0b897cec7 *./tests/data/b-libav.voc
+  32768 ./tests/data/b-libav.voc
+./tests/data/b-libav.voc CRC=0x49972c8c
+ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv420p.yuv
+ 304128 ./tests/data/b-libav-yuv420p.yuv
+ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv422p.yuv
+ 304128 ./tests/data/b-libav-yuv422p.yuv
+ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv444p.yuv
+ 304128 ./tests/data/b-libav-yuv444p.yuv
+ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuyv422.yuv
+ 304128 ./tests/data/b-libav-yuyv422.yuv
+545f61c353a8b4419808785cb4f0069d *./tests/data/b-libav-yuv410p.yuv
+ 304128 ./tests/data/b-libav-yuv410p.yuv
+d6c03f930018ff859bd43f52b92e9321 *./tests/data/b-libav-yuv411p.yuv
+ 304128 ./tests/data/b-libav-yuv411p.yuv
+14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj420p.yuv
+ 304128 ./tests/data/b-libav-yuvj420p.yuv
+14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj422p.yuv
+ 304128 ./tests/data/b-libav-yuvj422p.yuv
+14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj444p.yuv
+ 304128 ./tests/data/b-libav-yuvj444p.yuv
+deb2f7ebe297df2c1fe264d19b34d2fb *./tests/data/b-libav-rgb24.yuv
+ 304128 ./tests/data/b-libav-rgb24.yuv
+deb2f7ebe297df2c1fe264d19b34d2fb *./tests/data/b-libav-bgr24.yuv
+ 304128 ./tests/data/b-libav-bgr24.yuv
+deb2f7ebe297df2c1fe264d19b34d2fb *./tests/data/b-libav-rgb32.yuv
+ 304128 ./tests/data/b-libav-rgb32.yuv
+5d395f62bff8ac475f743268c772ca3a *./tests/data/b-libav-rgb565.yuv
+ 304128 ./tests/data/b-libav-rgb565.yuv
+2ffd6871fcbfe9570454e8703ac8ea01 *./tests/data/b-libav-rgb555.yuv
+ 304128 ./tests/data/b-libav-rgb555.yuv
+0b62dcf9b57b294dbaa5d9e99b1ee192 *./tests/data/b-libav-gray.yuv
+ 304128 ./tests/data/b-libav-gray.yuv
+e197450dae2feba9e757b551e1e9145c *./tests/data/b-libav-monow.yuv
+ 304128 ./tests/data/b-libav-monow.yuv
+e197450dae2feba9e757b551e1e9145c *./tests/data/b-libav-monob.yuv
+ 304128 ./tests/data/b-libav-monob.yuv
+7a319375916cae4e691ecb74295e5d2a *./tests/data/b-libav-pal8.yuv
+ 304128 ./tests/data/b-libav-pal8.yuv
diff --git a/tests/regression.sh b/tests/regression.sh
index 7a7e95c6f3..85e296253e 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -19,7 +19,7 @@ fi
 
 set -e
 
-datadir="./data"
+datadir="./tests/data"
 
 logfile="$datadir/ffmpeg.regression"
 outfile="$datadir/a-"
@@ -91,8 +91,8 @@ fi
 
 
 # various files
-ffmpeg="../ffmpeg_g"
-tiny_psnr="./tiny_psnr"
+ffmpeg="./ffmpeg_g"
+tiny_psnr="tests/tiny_psnr"
 reffile="$2"
 benchfile="$datadir/ffmpeg.bench"
 bench="$datadir/bench.tmp"
@@ -100,7 +100,7 @@ bench2="$datadir/bench2.tmp"
 raw_src="$3/%02d.pgm"
 raw_dst="$datadir/out.yuv"
 raw_ref="$datadir/ref.yuv"
-pcm_src="asynth1.sw"
+pcm_src="tests/asynth1.sw"
 pcm_dst="$datadir/out.wav"
 pcm_ref="$datadir/ref.wav"
 if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 94c4e1b727..27b15f9378 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -1,198 +1,198 @@
 ffmpeg regression test
-73ca6f1deab02d1d67a0e8495c026a9e *./data/a-mpeg1.mpg
-192783 ./data/a-mpeg1.mpg
-56147e94b12f08df7213e610e177823d *./data/out.yuv
+73ca6f1deab02d1d67a0e8495c026a9e *./tests/data/a-mpeg1.mpg
+192783 ./tests/data/a-mpeg1.mpg
+56147e94b12f08df7213e610e177823d *./tests/data/out.yuv
 stddev:  4.95 PSNR:34.21 bytes:7602176
-2d55ce623a7be4e8136f80266e487678 *./data/a-mpeg2.mpg
-198667 ./data/a-mpeg2.mpg
-b7cae8a1f751b821cddcbe4d5dbc518c *./data/out.yuv
+2d55ce623a7be4e8136f80266e487678 *./tests/data/a-mpeg2.mpg
+198667 ./tests/data/a-mpeg2.mpg
+b7cae8a1f751b821cddcbe4d5dbc518c *./tests/data/out.yuv
 stddev:  4.96 PSNR:34.19 bytes:7602176
-4dd6e884eeccfb5c0d9b5542349e3d62 *./data/a-mpeg2ivlc-qprd.mpg
-249692 ./data/a-mpeg2ivlc-qprd.mpg
-99214c2a75ece2a0bf4f5afebc0f8ed7 *./data/out.yuv
+4dd6e884eeccfb5c0d9b5542349e3d62 *./tests/data/a-mpeg2ivlc-qprd.mpg
+249692 ./tests/data/a-mpeg2ivlc-qprd.mpg
+99214c2a75ece2a0bf4f5afebc0f8ed7 *./tests/data/out.yuv
 stddev:  4.41 PSNR:35.22 bytes:7602176
-f979bcca866e6e4cad5dc6cb06e56cfb *./data/a-mpeg2.mpg
-198041 ./data/a-mpeg2.mpg
-f6d9bf24ff8676a7f6076c05cd2c81a3 *./data/out.yuv
+f979bcca866e6e4cad5dc6cb06e56cfb *./tests/data/a-mpeg2.mpg
+198041 ./tests/data/a-mpeg2.mpg
+f6d9bf24ff8676a7f6076c05cd2c81a3 *./tests/data/out.yuv
 stddev:  4.97 PSNR:34.18 bytes:7602176
-f90197a8b6e62ae25f82625337f27240 *./data/a-mpeg2i.mpg
-204579 ./data/a-mpeg2i.mpg
-ea5057b60146c06d40449cdfc686bf13 *./data/out.yuv
+f90197a8b6e62ae25f82625337f27240 *./tests/data/a-mpeg2i.mpg
+204579 ./tests/data/a-mpeg2i.mpg
+ea5057b60146c06d40449cdfc686bf13 *./tests/data/out.yuv
 stddev:  4.98 PSNR:34.17 bytes:7602176
-c346717be44450e41d9d6e07f59d1490 *./data/a-mpeg2thread.mpg
-182959 ./data/a-mpeg2thread.mpg
-02b85a7f67ced2d146a5c4e8000712b6 *./data/out.yuv
+c346717be44450e41d9d6e07f59d1490 *./tests/data/a-mpeg2thread.mpg
+182959 ./tests/data/a-mpeg2thread.mpg
+02b85a7f67ced2d146a5c4e8000712b6 *./tests/data/out.yuv
 stddev:  4.75 PSNR:34.57 bytes:7602176
-ff30b3df75626398873ac4f30093a5ae *./data/a-mpeg2threadivlc.mpg
-182105 ./data/a-mpeg2threadivlc.mpg
-02b85a7f67ced2d146a5c4e8000712b6 *./data/out.yuv
+ff30b3df75626398873ac4f30093a5ae *./tests/data/a-mpeg2threadivlc.mpg
+182105 ./tests/data/a-mpeg2threadivlc.mpg
+02b85a7f67ced2d146a5c4e8000712b6 *./tests/data/out.yuv
 stddev:  4.75 PSNR:34.57 bytes:7602176
-3942f86a6aa6fe5aea586fedf210e33e *./data/a-mpeg2reuse.mpg
-394265 ./data/a-mpeg2reuse.mpg
-afbc483eaa769925259e6094cfda2c72 *./data/out.yuv
+3942f86a6aa6fe5aea586fedf210e33e *./tests/data/a-mpeg2reuse.mpg
+394265 ./tests/data/a-mpeg2reuse.mpg
+afbc483eaa769925259e6094cfda2c72 *./tests/data/out.yuv
 stddev:  4.76 PSNR:34.56 bytes:7602176
-c09815e40a9d260628e1ebad8b2b3774 *./data/a-msmpeg4v2.avi
-129918 ./data/a-msmpeg4v2.avi
-8920194f8bf8f9cdd6c65b3df9e1a292 *./data/out.yuv
+c09815e40a9d260628e1ebad8b2b3774 *./tests/data/a-msmpeg4v2.avi
+129918 ./tests/data/a-msmpeg4v2.avi
+8920194f8bf8f9cdd6c65b3df9e1a292 *./tests/data/out.yuv
 stddev:  5.33 PSNR:33.58 bytes:7602176
-3069f95f2ffca1f20c8ea36e2625fabc *./data/a-msmpeg4.avi
-127680 ./data/a-msmpeg4.avi
-0e1c6e25c71c6a8fa8e506e3d97ca4c9 *./data/out.yuv
+3069f95f2ffca1f20c8ea36e2625fabc *./tests/data/a-msmpeg4.avi
+127680 ./tests/data/a-msmpeg4.avi
+0e1c6e25c71c6a8fa8e506e3d97ca4c9 *./tests/data/out.yuv
 stddev:  5.33 PSNR:33.58 bytes:7602176
-6896c9bdf765953d272c25e34795b934 *./data/a-wmv1.avi
-129548 ./data/a-wmv1.avi
-81eee429b665254d19a06607463c0b5e *./data/out.yuv
+6896c9bdf765953d272c25e34795b934 *./tests/data/a-wmv1.avi
+129548 ./tests/data/a-wmv1.avi
+81eee429b665254d19a06607463c0b5e *./tests/data/out.yuv
 stddev:  5.33 PSNR:33.59 bytes:7602176
-34b40c67036c8e09740f7acfe3d43df6 *./data/a-wmv2.avi
-129864 ./data/a-wmv2.avi
-81eee429b665254d19a06607463c0b5e *./data/out.yuv
+34b40c67036c8e09740f7acfe3d43df6 *./tests/data/a-wmv2.avi
+129864 ./tests/data/a-wmv2.avi
+81eee429b665254d19a06607463c0b5e *./tests/data/out.yuv
 stddev:  5.33 PSNR:33.59 bytes:7602176
-dfd005d4c9030a0dc889c828a6408b9c *./data/a-h261.avi
-191086 ./data/a-h261.avi
-db7ceff174823b98834faa2320ca89ac *./data/out.yuv
+dfd005d4c9030a0dc889c828a6408b9c *./tests/data/a-h261.avi
+191086 ./tests/data/a-h261.avi
+db7ceff174823b98834faa2320ca89ac *./tests/data/out.yuv
 stddev:  6.38 PSNR:32.02 bytes:7602176
-9a368687ab34c48079f11a202839a6bc *./data/a-h263.avi
-160106 ./data/a-h263.avi
-61213b91b359697ebcefb9e0a53ac54a *./data/out.yuv
+9a368687ab34c48079f11a202839a6bc *./tests/data/a-h263.avi
+160106 ./tests/data/a-h263.avi
+61213b91b359697ebcefb9e0a53ac54a *./tests/data/out.yuv
 stddev:  5.43 PSNR:33.41 bytes:7602176
-c7644d40e9f40bbd98e5a978f9f94bb4 *./data/a-h263p.avi
-868018 ./data/a-h263p.avi
-4b0ee791f280029dc03c528f76f195d4 *./data/out.yuv
+c7644d40e9f40bbd98e5a978f9f94bb4 *./tests/data/a-h263p.avi
+868018 ./tests/data/a-h263p.avi
+4b0ee791f280029dc03c528f76f195d4 *./tests/data/out.yuv
 stddev:  1.91 PSNR:42.49 bytes:7602176
-f15f07988bfdb2851f88ebe3036b72d3 *./data/a-odivx.mp4
-119797 ./data/a-odivx.mp4
-90a3577850239083a9042bef33c50e85 *./data/out.yuv
+f15f07988bfdb2851f88ebe3036b72d3 *./tests/data/a-odivx.mp4
+119797 ./tests/data/a-odivx.mp4
+90a3577850239083a9042bef33c50e85 *./tests/data/out.yuv
 stddev:  5.34 PSNR:33.56 bytes:7602176
-a1323da0c8b437cd6961f8c90451880b *./data/a-huffyuv.avi
-6455232 ./data/a-huffyuv.avi
-dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
+a1323da0c8b437cd6961f8c90451880b *./tests/data/a-huffyuv.avi
+6455232 ./tests/data/a-huffyuv.avi
+dde5895817ad9d219f79a52d0bdfb001 *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-968ca132d8cf46f84e657abcf8473b7c *./data/a-mpeg4-rc.avi
-227934 ./data/a-mpeg4-rc.avi
-895773fe8250c806a0d1592a6dd12401 *./data/out.yuv
+968ca132d8cf46f84e657abcf8473b7c *./tests/data/a-mpeg4-rc.avi
+227934 ./tests/data/a-mpeg4-rc.avi
+895773fe8250c806a0d1592a6dd12401 *./tests/data/out.yuv
 stddev:  4.24 PSNR:35.56 bytes:7602176
-9001cf571eb7f26fa5592bdec6538583 *./data/a-mpeg4-adv.avi
-173590 ./data/a-mpeg4-adv.avi
-699edf05648fdc42196b7bebef9be269 *./data/out.yuv
+9001cf571eb7f26fa5592bdec6538583 *./tests/data/a-mpeg4-adv.avi
+173590 ./tests/data/a-mpeg4-adv.avi
+699edf05648fdc42196b7bebef9be269 *./tests/data/out.yuv
 stddev:  4.84 PSNR:34.41 bytes:7602176
-1e12bb209dae0ab4b64265b0a4262257 *./data/a-mpeg4-qprd.avi
-234048 ./data/a-mpeg4-qprd.avi
-1ec355ffb30d2adf302a550cf5812636 *./data/out.yuv
+1e12bb209dae0ab4b64265b0a4262257 *./tests/data/a-mpeg4-qprd.avi
+234048 ./tests/data/a-mpeg4-qprd.avi
+1ec355ffb30d2adf302a550cf5812636 *./tests/data/out.yuv
 stddev:  4.23 PSNR:35.58 bytes:7602176
-d581d6f4a331325905b8ffb05cd3bfd3 *./data/a-mpeg4-adap.avi
-204284 ./data/a-mpeg4-adap.avi
-c2c7f1c7844ab92d34247ccb70198c61 *./data/out.yuv
+d581d6f4a331325905b8ffb05cd3bfd3 *./tests/data/a-mpeg4-adap.avi
+204284 ./tests/data/a-mpeg4-adap.avi
+c2c7f1c7844ab92d34247ccb70198c61 *./tests/data/out.yuv
 stddev:  4.04 PSNR:35.99 bytes:7602176
-a5150067914ee1dee50f8fc8dcaee841 *./data/a-mpeg4-Q.avi
-165802 ./data/a-mpeg4-Q.avi
-4dcc71ad79bee90777cf5299044be362 *./data/out.yuv
+a5150067914ee1dee50f8fc8dcaee841 *./tests/data/a-mpeg4-Q.avi
+165802 ./tests/data/a-mpeg4-Q.avi
+4dcc71ad79bee90777cf5299044be362 *./tests/data/out.yuv
 stddev:  4.00 PSNR:36.08 bytes:7602176
-8cd8940d7451925784536fe9b2f2a5e3 *./data/a-mpeg4-thread.avi
-254260 ./data/a-mpeg4-thread.avi
-d160a4224ea1af66c85178912f8d3a7c *./data/out.yuv
+8cd8940d7451925784536fe9b2f2a5e3 *./tests/data/a-mpeg4-thread.avi
+254260 ./tests/data/a-mpeg4-thread.avi
+d160a4224ea1af66c85178912f8d3a7c *./tests/data/out.yuv
 stddev:  4.03 PSNR:36.01 bytes:7602176
-5b5b88ce610114e346a5df4f46995bb9 *./data/a-mpeg4-PSP.mp4
-325006 ./data/a-mpeg4-PSP.mp4
-90e65096aa9ebafa3fe3f44a5a47cdc4 *./data/a-error-mpeg4-adv.avi
-176588 ./data/a-error-mpeg4-adv.avi
-113defd3f8daf878e0b3fc03fafb4c09 *./data/out.yuv
+5b5b88ce610114e346a5df4f46995bb9 *./tests/data/a-mpeg4-PSP.mp4
+325006 ./tests/data/a-mpeg4-PSP.mp4
+90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/a-error-mpeg4-adv.avi
+176588 ./tests/data/a-error-mpeg4-adv.avi
+113defd3f8daf878e0b3fc03fafb4c09 *./tests/data/out.yuv
 stddev:  9.02 PSNR:29.01 bytes:7602176
-c41187c99588fb7229ad330b2f80d28b *./data/a-mpeg4-nr.avi
-155044 ./data/a-mpeg4-nr.avi
-f7fc191308679f709405e62271f5c65f *./data/out.yuv
+c41187c99588fb7229ad330b2f80d28b *./tests/data/a-mpeg4-nr.avi
+155044 ./tests/data/a-mpeg4-nr.avi
+f7fc191308679f709405e62271f5c65f *./tests/data/out.yuv
 stddev:  4.73 PSNR:34.62 bytes:7602176
-977f3caf286e8f36c6ab4c7464632f26 *./data/a-mpeg1b.mpg
-229806 ./data/a-mpeg1b.mpg
-f41c60846bfb8cb6dcf6071c846c82b4 *./data/out.yuv
+977f3caf286e8f36c6ab4c7464632f26 *./tests/data/a-mpeg1b.mpg
+229806 ./tests/data/a-mpeg1b.mpg
+f41c60846bfb8cb6dcf6071c846c82b4 *./tests/data/out.yuv
 stddev:  4.13 PSNR:35.79 bytes:7602176
-b179402bba391073b5f5f9324a834061 *./data/a-mjpeg.avi
-703564 ./data/a-mjpeg.avi
-b1aa72cfb6f9cc3f525b27abc86a8f51 *./data/out.yuv
+b179402bba391073b5f5f9324a834061 *./tests/data/a-mjpeg.avi
+703564 ./tests/data/a-mjpeg.avi
+b1aa72cfb6f9cc3f525b27abc86a8f51 *./tests/data/out.yuv
 stddev:  4.38 PSNR:35.28 bytes:7602176
-bc0d8c868c1a05db0ff03f41768f6c5e *./data/a-ljpeg.avi
-4766558 ./data/a-ljpeg.avi
-dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
+bc0d8c868c1a05db0ff03f41768f6c5e *./tests/data/a-ljpeg.avi
+4766558 ./tests/data/a-ljpeg.avi
+dde5895817ad9d219f79a52d0bdfb001 *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-f67cd488dfd06c03ad1d6d94d81b80c8 *./data/a-jpegls.avi
-8334488 ./data/a-jpegls.avi
-a63d4e3ea1f0b0c0d44821da9e09b8f4 *./data/out.yuv
+f67cd488dfd06c03ad1d6d94d81b80c8 *./tests/data/a-jpegls.avi
+8334488 ./tests/data/a-jpegls.avi
+a63d4e3ea1f0b0c0d44821da9e09b8f4 *./tests/data/out.yuv
 stddev:  0.67 PSNR:51.57 bytes:7602176
-989a42671603dc1a7e6b156dccf0e820 *./data/a-rv10.rm
-154330 ./data/a-rv10.rm
-61213b91b359697ebcefb9e0a53ac54a *./data/out.yuv
+989a42671603dc1a7e6b156dccf0e820 *./tests/data/a-rv10.rm
+154330 ./tests/data/a-rv10.rm
+61213b91b359697ebcefb9e0a53ac54a *./tests/data/out.yuv
 stddev:  5.43 PSNR:33.41 bytes:7602176
-1b1cbff8e78602de498b4314cb991e72 *./data/a-rv20.rm
-132754 ./data/a-rv20.rm
-c66afdcc0daac2f1b4167b9811968877 *./data/out.yuv
+1b1cbff8e78602de498b4314cb991e72 *./tests/data/a-rv20.rm
+132754 ./tests/data/a-rv20.rm
+c66afdcc0daac2f1b4167b9811968877 *./tests/data/out.yuv
 stddev:  5.42 PSNR:33.44 bytes:7602176
-4eb34d2de25f67a2706456e999338fe9 *./data/a-asv1.avi
-832512 ./data/a-asv1.avi
-c96ff7fd17c52f99ddb7922a4cb9168f *./data/out.yuv
+4eb34d2de25f67a2706456e999338fe9 *./tests/data/a-asv1.avi
+832512 ./tests/data/a-asv1.avi
+c96ff7fd17c52f99ddb7922a4cb9168f *./tests/data/out.yuv
 stddev: 10.47 PSNR:27.72 bytes:7602176
-9649a4b68fb1107bad13e8a7574cc72d *./data/a-asv2.avi
-789072 ./data/a-asv2.avi
-74a78015b64b2cf8cb9da2e44f508a69 *./data/out.yuv
+9649a4b68fb1107bad13e8a7574cc72d *./tests/data/a-asv2.avi
+789072 ./tests/data/a-asv2.avi
+74a78015b64b2cf8cb9da2e44f508a69 *./tests/data/out.yuv
 stddev: 10.28 PSNR:27.88 bytes:7602176
-7163b470e93feb36b3f01e82168a3d31 *./data/a-flv.flv
-131360 ./data/a-flv.flv
-8999c8264fb0941561f64c4a736e9d88 *./data/out.yuv
+7163b470e93feb36b3f01e82168a3d31 *./tests/data/a-flv.flv
+131360 ./tests/data/a-flv.flv
+8999c8264fb0941561f64c4a736e9d88 *./tests/data/out.yuv
 stddev:  5.33 PSNR:33.58 bytes:7602176
-d72b0960e162d4998b9acbabb07e99ab *./data/a-ffv1.avi
-3525804 ./data/a-ffv1.avi
-dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
+d72b0960e162d4998b9acbabb07e99ab *./tests/data/a-ffv1.avi
+3525804 ./tests/data/a-ffv1.avi
+dde5895817ad9d219f79a52d0bdfb001 *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-40a6e938ac2bd92ee12cd57925e86454 *./data/a-snow.avi
-68758 ./data/a-snow.avi
-1e356854142898c7c4aab4bfedadf235 *./data/out.yuv
+40a6e938ac2bd92ee12cd57925e86454 *./tests/data/a-snow.avi
+68758 ./tests/data/a-snow.avi
+1e356854142898c7c4aab4bfedadf235 *./tests/data/out.yuv
 stddev: 10.86 PSNR:27.40 bytes:7602176
-3d0da6aeec9b80c6ee0ff4b747bdd0f0 *./data/a-snow53.avi
-2721980 ./data/a-snow53.avi
-dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
+3d0da6aeec9b80c6ee0ff4b747bdd0f0 *./tests/data/a-snow53.avi
+2721980 ./tests/data/a-snow53.avi
+dde5895817ad9d219f79a52d0bdfb001 *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-54cdeaee32d1007666a1e487e739daf6 *./data/a-dv.dv
-7200000 ./data/a-dv.dv
-75bf724e37f667f36af50e2051846574 *./data/out.yuv
+54cdeaee32d1007666a1e487e739daf6 *./tests/data/a-dv.dv
+7200000 ./tests/data/a-dv.dv
+75bf724e37f667f36af50e2051846574 *./tests/data/out.yuv
 stddev:  3.11 PSNR:38.24 bytes:7602176
-ac6741e4c79e9ed18f179c4124ede29c *./data/a-dv.dv
-14400000 ./data/a-dv.dv
-ad9907f4ef608f025f5fc38b4b067b37 *./data/out.yuv
+ac6741e4c79e9ed18f179c4124ede29c *./tests/data/a-dv.dv
+14400000 ./tests/data/a-dv.dv
+ad9907f4ef608f025f5fc38b4b067b37 *./tests/data/out.yuv
 stddev:  3.11 PSNR:38.25 bytes:7602176
-7ba9292d663819a9a1d1cdecc6f1b079 *./data/a-svq1.mov
-768407 ./data/a-svq1.mov
-6bc10518bc387c3bdf117997713ee69a *./data/out.yuv
+7ba9292d663819a9a1d1cdecc6f1b079 *./tests/data/a-svq1.mov
+768407 ./tests/data/a-svq1.mov
+6bc10518bc387c3bdf117997713ee69a *./tests/data/out.yuv
 stddev:  3.44 PSNR:37.39 bytes:7602176
-21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
-95712 ./data/a-mp2.mp2
-83f8df5d5f84480566af548bb037fceb *./data/out.wav
+21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
+95712 ./tests/data/a-mp2.mp2
+83f8df5d5f84480566af548bb037fceb *./tests/data/out.wav
 stddev:9330.70 PSNR:16.92 bytes:1054720
 stddev:4396.13 PSNR:23.46 bytes:1052672
-aefe11ab5067621a1c674859d6413891 *./data/a-ac3.rm
-98203 ./data/a-ac3.rm
-39878597b1d65cce473639a7d8c93b02 *./data/a-g726.wav
-24279 ./data/a-g726.wav
-888f2f016e608d044a1bacbca5497ed2 *./data/out.wav
+aefe11ab5067621a1c674859d6413891 *./tests/data/a-ac3.rm
+98203 ./tests/data/a-ac3.rm
+39878597b1d65cce473639a7d8c93b02 *./tests/data/a-g726.wav
+24279 ./tests/data/a-g726.wav
+888f2f016e608d044a1bacbca5497ed2 *./tests/data/out.wav
 stddev:8368.02 PSNR:17.87 bytes:96256
-de3f0e1f50b19bd8572fdd3dee2e72c4 *./data/a-adpcm_ima.wav
-266300 ./data/a-adpcm_ima.wav
-60178d48204f5662d91776e36eddc82e *./data/out.wav
+de3f0e1f50b19bd8572fdd3dee2e72c4 *./tests/data/a-adpcm_ima.wav
+266300 ./tests/data/a-adpcm_ima.wav
+60178d48204f5662d91776e36eddc82e *./tests/data/out.wav
 stddev:11441.89 PSNR:15.15 bytes:1054720
-628d4789cf9ee16a756ac54b7fd8650d *./data/a-adpcm_ms.wav
-267320 ./data/a-adpcm_ms.wav
-91a84bb4f319a3a0bf0c0441b3d3a529 *./data/out.wav
+628d4789cf9ee16a756ac54b7fd8650d *./tests/data/a-adpcm_ms.wav
+267320 ./tests/data/a-adpcm_ms.wav
+91a84bb4f319a3a0bf0c0441b3d3a529 *./tests/data/out.wav
 stddev:1050.18 PSNR:35.89 bytes:1054720
-ab11d9151644cbff27827b7e89f37aa9 *./data/a-adpcm_yam.wav
-264248 ./data/a-adpcm_yam.wav
-e92cec8c07913ffb91ad2b11f79cdc00 *./data/out.wav
+ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
+264248 ./tests/data/a-adpcm_yam.wav
+e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/out.wav
 stddev:18312.68 PSNR:11.06 bytes:1056768
-c3382f03ce2efb5d475240d288a33898 *./data/a-flac.flac
-353368 ./data/a-flac.flac
-c4228df189aad9567a037727d0e763e4 *./data/out.wav
+c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
+353368 ./tests/data/a-flac.flac
+c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav
 stddev: 33.31 PSNR:65.87 bytes:1040384
-0c406c4e4586ca27064e28637b662631 *./data/a-wmav1.asf
-106004 ./data/a-wmav1.asf
+0c406c4e4586ca27064e28637b662631 *./tests/data/a-wmav1.asf
+106004 ./tests/data/a-wmav1.asf
 stddev:12251.50 PSNR:14.56 bytes:1056768
 stddev:2106.00 PSNR:29.85 bytes:1048576
-82442aaa5fdbd327769e4c4ad369147e *./data/a-wmav2.asf
-106044 ./data/a-wmav2.asf
+82442aaa5fdbd327769e4c4ad369147e *./tests/data/a-wmav2.asf
+106044 ./tests/data/a-wmav2.asf
 stddev:12255.92 PSNR:14.55 bytes:1056768
 stddev:2099.31 PSNR:29.88 bytes:1048576
diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 9ea71ad548..f6fc7f0b82 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -1,5 +1,5 @@
 ----------------
-data/a-ac3.rm
+tests/data/a-ac3.rm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:271 size:556 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:37355.520000 pts:37355.520000 pos:49793 size:25731 flags:1
@@ -40,7 +40,7 @@ ret:-1 st:-1 ts:0.460008 flags:0
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:37355.520000 pts:37355.520000 pos:49793 size:25731 flags:1
 ----------------
-data/a-adpcm_ima.wav
+tests/data/a-adpcm_ima.wav
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:60 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.960000 pts:-0.960000 pos:32768 size:4096 flags:1
@@ -95,7 +95,7 @@ ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8252 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41020 size:4096 flags:1
 ----------------
-data/a-adpcm_ms.wav
+tests/data/a-adpcm_ms.wav
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.960000 pts:-0.960000 pos:32768 size:4096 flags:1
@@ -150,7 +150,7 @@ ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8248 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41016 size:4096 flags:1
 ----------------
-data/a-adpcm_yam.wav
+tests/data/a-adpcm_yam.wav
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.960000 pts:-0.960000 pos:32768 size:4096 flags:1
@@ -205,7 +205,7 @@ ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8248 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41016 size:4096 flags:1
 ----------------
-data/a-asv1.avi
+tests/data/a-asv1.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5668 size:14316 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5668 size:14316 flags:1
@@ -253,7 +253,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:180224 size:15168 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-asv2.avi
+tests/data/a-asv2.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5668 size:13732 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5668 size:13732 flags:1
@@ -301,7 +301,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:171024 size:14392 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-dv.dv
+tests/data/a-dv.dv
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:288000 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:288000 flags:1
@@ -356,7 +356,7 @@ ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:-1 size:288000 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:288000 flags:1
 ----------------
-data/a-error-mpeg4-adv.avi
+tests/data/a-error-mpeg4-adv.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:9564 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:9564 flags:1
@@ -404,7 +404,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:36782 size:10310 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-ffv1.avi
+tests/data/a-ffv1.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:70200 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:70200 flags:1
@@ -452,7 +452,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:796840 size:67971 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-flac.flac
+tests/data/a-flac.flac
 ret: 0 st: 0 dts:-102481911520608.625000 pts:-102481911520608.625000 pos:0 size:1024 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -481,7 +481,7 @@ ret:-1 st: 0 ts:1.565844 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-flv.flv
+tests/data/a-flv.flv
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:10380 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:10380 flags:1
@@ -529,7 +529,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:25960 size:10089 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-g726.wav
+tests/data/a-g726.wav
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret:-5
@@ -584,7 +584,7 @@ ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:1896 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret:-5
 ----------------
-data/a-h261.avi
+tests/data/a-h261.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:15314 size:9645 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:15314 size:9645 flags:1
@@ -632,7 +632,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:54090 size:9404 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-h263.avi
+tests/data/a-h263.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:16050 size:10381 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:16050 size:10381 flags:1
@@ -680,7 +680,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:46548 size:10090 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-h263p.avi
+tests/data/a-h263p.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:41876 size:36208 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:41876 size:36208 flags:1
@@ -728,7 +728,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:207578 size:36515 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-huffyuv.avi
+tests/data/a-huffyuv.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5736 size:129760 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5736 size:129760 flags:1
@@ -776,7 +776,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:1546184 size:128860 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-jpegls.avi
+tests/data/a-jpegls.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:169698 size:164030 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:169698 size:164030 flags:1
@@ -824,7 +824,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:2036046 size:159683 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-ljpeg.avi
+tests/data/a-ljpeg.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:101714 size:96046 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:101714 size:96046 flags:1
@@ -872,7 +872,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:1234190 size:95024 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mjpeg.avi
+tests/data/a-mjpeg.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:18314 size:12645 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:18314 size:12645 flags:1
@@ -920,7 +920,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:165884 size:12719 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mp2.mp2
+tests/data/a-mp2.mp2
 ret: 0 st: 0 dts:-102481911520608.625000 pts:-102481911520608.625000 pos:0 size:417 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:417 flags:1
@@ -975,7 +975,7 @@ ret: 0 st: 0 dts:0.470200 pts:0.470200 pos:7523 size:418 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:417 flags:1
 ----------------
-data/a-mpeg1b.mpg
+tests/data/a-mpeg1b.mpg
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:11264 size:11817 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:11264 size:11817 flags:1
@@ -1023,7 +1023,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.840000 pts:-102481911520608.625000 pos:94832 size:13267 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg1.mpg
+tests/data/a-mpeg1.mpg
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:9216 size:9779 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9779 flags:1
@@ -1071,7 +1071,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:-102481911520608.625000 pos:46937 size:9873 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg2i.mpg
+tests/data/a-mpeg2i.mpg
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
@@ -1119,7 +1119,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.920000 pts:-102481911520608.625000 pos:92392 size:10965 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg2ivlc-qprd.mpg
+tests/data/a-mpeg2ivlc-qprd.mpg
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:16384 size:16533 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:16384 size:16533 flags:1
@@ -1167,7 +1167,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.840000 pts:-102481911520608.625000 pos:180534 size:14893 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg2.mpg
+tests/data/a-mpeg2.mpg
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9911 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9911 flags:1
@@ -1215,7 +1215,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.920000 pts:-102481911520608.625000 pos:89343 size:10909 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg2reuse.mpg
+tests/data/a-mpeg2reuse.mpg
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
@@ -1263,7 +1263,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.840000 pts:-102481911520608.625000 pos:167721 size:23537 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg2threadivlc.mpg
+tests/data/a-mpeg2threadivlc.mpg
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
@@ -1311,7 +1311,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.840000 pts:-102481911520608.625000 pos:79182 size:10791 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg2thread.mpg
+tests/data/a-mpeg2thread.mpg
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-0.040000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
@@ -1359,7 +1359,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.840000 pts:-102481911520608.625000 pos:79253 size:10965 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-adap.avi
+tests/data/a-mpeg4-adap.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:7585 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:7585 flags:1
@@ -1407,7 +1407,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:106306 size:15898 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-adv.avi
+tests/data/a-mpeg4-adv.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:9113 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:9113 flags:1
@@ -1455,7 +1455,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:38332 size:9635 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-nr.avi
+tests/data/a-mpeg4-nr.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:10673 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:10673 flags:1
@@ -1503,7 +1503,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:35312 size:9987 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-PSP.mp4
+tests/data/a-mpeg4-PSP.mp4
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
@@ -1551,7 +1551,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:108454 size:21469 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-Q.avi
+tests/data/a-mpeg4-Q.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:11942 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:11942 flags:1
@@ -1599,7 +1599,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:64442 size:13382 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-qprd.avi
+tests/data/a-mpeg4-qprd.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14733 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14733 flags:1
@@ -1647,7 +1647,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:159328 size:13215 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-rc.avi
+tests/data/a-mpeg4-rc.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:15766 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:15766 flags:1
@@ -1695,7 +1695,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:154792 size:13382 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-mpeg4-thread.avi
+tests/data/a-mpeg4-thread.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14645 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14645 flags:1
@@ -1743,7 +1743,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:167964 size:15139 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-msmpeg4.avi
+tests/data/a-msmpeg4.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:8637 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:8637 flags:1
@@ -1791,7 +1791,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:29400 size:8502 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-msmpeg4v2.avi
+tests/data/a-msmpeg4v2.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:9003 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:9003 flags:1
@@ -1839,7 +1839,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:29782 size:8869 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-odivx.mp4
+tests/data/a-odivx.mp4
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1
@@ -1887,7 +1887,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23263 size:8524 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-rv10.rm
+tests/data/a-rv10.rm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:239 size:10379 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.040000 pts:0.040000 pos:10637 size:1562 flags:0
@@ -1942,7 +1942,7 @@ ret: 0 st: 0 dts:0.520000 pts:0.520000 pos:41239 size:1391 flags:0
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.040000 pts:0.040000 pos:10637 size:1562 flags:0
 ----------------
-data/a-rv20.rm
+tests/data/a-rv20.rm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:239 size:9352 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.040000 pts:0.040000 pos:9610 size:1075 flags:0
@@ -1997,7 +1997,7 @@ ret: 0 st: 0 dts:0.520000 pts:0.520000 pos:35101 size:1438 flags:0
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.040000 pts:0.040000 pos:9610 size:1075 flags:0
 ----------------
-data/a-snow53.avi
+tests/data/a-snow53.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
@@ -2045,7 +2045,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605698 size:71059 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-snow.avi
+tests/data/a-snow.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2986 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2986 flags:1
@@ -2093,7 +2093,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:18006 size:3229 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-svq1.mov
+tests/data/a-svq1.mov
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:22272 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:22272 flags:1
@@ -2141,7 +2141,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:157248 size:21908 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-wmav1.asf
+tests/data/a-wmav1.asf
 ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:404 size:743 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:3.286000 pts:3.286000 pos:3604 size:743 flags:1
@@ -2196,7 +2196,7 @@ ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:404 size:743 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:404 size:743 flags:1
 ----------------
-data/a-wmav2.asf
+tests/data/a-wmav2.asf
 ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:444 size:743 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:3.286000 pts:3.286000 pos:3644 size:743 flags:1
@@ -2251,7 +2251,7 @@ ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:444 size:743 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:444 size:743 flags:1
 ----------------
-data/a-wmv1.avi
+tests/data/a-wmv1.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:8995 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:8995 flags:1
@@ -2299,7 +2299,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:29812 size:8798 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/a-wmv2.avi
+tests/data/a-wmv2.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5664 size:8918 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5664 size:8918 flags:1
@@ -2347,189 +2347,189 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:29644 size:8840 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav01.bmp
+tests/data/b-libav01.bmp
 ----------------
-data/b-libav01.jpg
+tests/data/b-libav01.jpg
 ----------------
-data/b-libav01.pgm
+tests/data/b-libav01.pgm
 ----------------
-data/b-libav01.ppm
+tests/data/b-libav01.ppm
 ----------------
-data/b-libav01.sgi
+tests/data/b-libav01.sgi
 ----------------
-data/b-libav01.tga
+tests/data/b-libav01.tga
 ----------------
-data/b-libav01.tiff
+tests/data/b-libav01.tiff
 ----------------
-data/b-libav02.bmp
+tests/data/b-libav02.bmp
 ----------------
-data/b-libav02.jpg
+tests/data/b-libav02.jpg
 ----------------
-data/b-libav02.pgm
+tests/data/b-libav02.pgm
 ----------------
-data/b-libav02.ppm
+tests/data/b-libav02.ppm
 ----------------
-data/b-libav02.sgi
+tests/data/b-libav02.sgi
 ----------------
-data/b-libav02.tga
+tests/data/b-libav02.tga
 ----------------
-data/b-libav02.tiff
+tests/data/b-libav02.tiff
 ----------------
-data/b-libav03.bmp
+tests/data/b-libav03.bmp
 ----------------
-data/b-libav03.jpg
+tests/data/b-libav03.jpg
 ----------------
-data/b-libav03.pgm
+tests/data/b-libav03.pgm
 ----------------
-data/b-libav03.ppm
+tests/data/b-libav03.ppm
 ----------------
-data/b-libav03.sgi
+tests/data/b-libav03.sgi
 ----------------
-data/b-libav03.tga
+tests/data/b-libav03.tga
 ----------------
-data/b-libav03.tiff
+tests/data/b-libav03.tiff
 ----------------
-data/b-libav04.bmp
+tests/data/b-libav04.bmp
 ----------------
-data/b-libav04.jpg
+tests/data/b-libav04.jpg
 ----------------
-data/b-libav04.pgm
+tests/data/b-libav04.pgm
 ----------------
-data/b-libav04.ppm
+tests/data/b-libav04.ppm
 ----------------
-data/b-libav04.sgi
+tests/data/b-libav04.sgi
 ----------------
-data/b-libav04.tga
+tests/data/b-libav04.tga
 ----------------
-data/b-libav04.tiff
+tests/data/b-libav04.tiff
 ----------------
-data/b-libav05.bmp
+tests/data/b-libav05.bmp
 ----------------
-data/b-libav05.jpg
+tests/data/b-libav05.jpg
 ----------------
-data/b-libav05.pgm
+tests/data/b-libav05.pgm
 ----------------
-data/b-libav05.ppm
+tests/data/b-libav05.ppm
 ----------------
-data/b-libav05.sgi
+tests/data/b-libav05.sgi
 ----------------
-data/b-libav05.tga
+tests/data/b-libav05.tga
 ----------------
-data/b-libav05.tiff
+tests/data/b-libav05.tiff
 ----------------
-data/b-libav06.bmp
+tests/data/b-libav06.bmp
 ----------------
-data/b-libav06.jpg
+tests/data/b-libav06.jpg
 ----------------
-data/b-libav06.pgm
+tests/data/b-libav06.pgm
 ----------------
-data/b-libav06.ppm
+tests/data/b-libav06.ppm
 ----------------
-data/b-libav06.sgi
+tests/data/b-libav06.sgi
 ----------------
-data/b-libav06.tga
+tests/data/b-libav06.tga
 ----------------
-data/b-libav06.tiff
+tests/data/b-libav06.tiff
 ----------------
-data/b-libav07.bmp
+tests/data/b-libav07.bmp
 ----------------
-data/b-libav07.jpg
+tests/data/b-libav07.jpg
 ----------------
-data/b-libav07.pgm
+tests/data/b-libav07.pgm
 ----------------
-data/b-libav07.ppm
+tests/data/b-libav07.ppm
 ----------------
-data/b-libav07.sgi
+tests/data/b-libav07.sgi
 ----------------
-data/b-libav07.tga
+tests/data/b-libav07.tga
 ----------------
-data/b-libav07.tiff
+tests/data/b-libav07.tiff
 ----------------
-data/b-libav08.bmp
+tests/data/b-libav08.bmp
 ----------------
-data/b-libav08.jpg
+tests/data/b-libav08.jpg
 ----------------
-data/b-libav08.pgm
+tests/data/b-libav08.pgm
 ----------------
-data/b-libav08.ppm
+tests/data/b-libav08.ppm
 ----------------
-data/b-libav08.sgi
+tests/data/b-libav08.sgi
 ----------------
-data/b-libav08.tga
+tests/data/b-libav08.tga
 ----------------
-data/b-libav08.tiff
+tests/data/b-libav08.tiff
 ----------------
-data/b-libav09.bmp
+tests/data/b-libav09.bmp
 ----------------
-data/b-libav09.jpg
+tests/data/b-libav09.jpg
 ----------------
-data/b-libav09.pgm
+tests/data/b-libav09.pgm
 ----------------
-data/b-libav09.ppm
+tests/data/b-libav09.ppm
 ----------------
-data/b-libav09.sgi
+tests/data/b-libav09.sgi
 ----------------
-data/b-libav09.tga
+tests/data/b-libav09.tga
 ----------------
-data/b-libav09.tiff
+tests/data/b-libav09.tiff
 ----------------
-data/b-libav10.bmp
+tests/data/b-libav10.bmp
 ----------------
-data/b-libav10.jpg
+tests/data/b-libav10.jpg
 ----------------
-data/b-libav10.pgm
+tests/data/b-libav10.pgm
 ----------------
-data/b-libav10.ppm
+tests/data/b-libav10.ppm
 ----------------
-data/b-libav10.sgi
+tests/data/b-libav10.sgi
 ----------------
-data/b-libav10.tga
+tests/data/b-libav10.tga
 ----------------
-data/b-libav10.tiff
+tests/data/b-libav10.tiff
 ----------------
-data/b-libav11.bmp
+tests/data/b-libav11.bmp
 ----------------
-data/b-libav11.jpg
+tests/data/b-libav11.jpg
 ----------------
-data/b-libav11.pgm
+tests/data/b-libav11.pgm
 ----------------
-data/b-libav11.ppm
+tests/data/b-libav11.ppm
 ----------------
-data/b-libav11.sgi
+tests/data/b-libav11.sgi
 ----------------
-data/b-libav11.tga
+tests/data/b-libav11.tga
 ----------------
-data/b-libav11.tiff
+tests/data/b-libav11.tiff
 ----------------
-data/b-libav12.bmp
+tests/data/b-libav12.bmp
 ----------------
-data/b-libav12.jpg
+tests/data/b-libav12.jpg
 ----------------
-data/b-libav12.pgm
+tests/data/b-libav12.pgm
 ----------------
-data/b-libav12.ppm
+tests/data/b-libav12.ppm
 ----------------
-data/b-libav12.sgi
+tests/data/b-libav12.sgi
 ----------------
-data/b-libav12.tga
+tests/data/b-libav12.tga
 ----------------
-data/b-libav12.tiff
+tests/data/b-libav12.tiff
 ----------------
-data/b-libav13.bmp
+tests/data/b-libav13.bmp
 ----------------
-data/b-libav13.jpg
+tests/data/b-libav13.jpg
 ----------------
-data/b-libav13.pgm
+tests/data/b-libav13.pgm
 ----------------
-data/b-libav13.ppm
+tests/data/b-libav13.ppm
 ----------------
-data/b-libav13.sgi
+tests/data/b-libav13.sgi
 ----------------
-data/b-libav13.tga
+tests/data/b-libav13.tga
 ----------------
-data/b-libav13.tiff
+tests/data/b-libav13.tiff
 ----------------
-data/b-libav.aif
+tests/data/b-libav.aif
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:54 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-1.000000 pts:-1.000000 pos:32768 size:4096 flags:1
@@ -2584,9 +2584,9 @@ ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40626 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73394 size:4096 flags:1
 ----------------
-data/b-libav.al
+tests/data/b-libav.al
 ----------------
-data/b-libav.asf
+tests/data/b-libav.asf
 ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:575 size:28874 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 1 dts:3.544000 pts:3.544000 pos:150975 size:209 flags:1
@@ -2641,7 +2641,7 @@ ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:575 size:28874 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:575 size:28874 flags:1
 ----------------
-data/b-libav.au
+tests/data/b-libav.au
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:24 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-1.000000 pts:-1.000000 pos:32768 size:4096 flags:1
@@ -2696,7 +2696,7 @@ ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40596 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73364 size:4096 flags:1
 ----------------
-data/b-libav.avi
+tests/data/b-libav.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:9908 size:28118 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:9908 size:28118 flags:1
@@ -2742,9 +2742,9 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:158912 size:27442 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav-bgr24.yuv
+tests/data/b-libav-bgr24.yuv
 ----------------
-data/b-libav.dv
+tests/data/b-libav.dv
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:144000 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:144000 flags:1
@@ -2799,7 +2799,7 @@ ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:-1 size:144000 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:144000 flags:1
 ----------------
-data/b-libav.ffm
+tests/data/b-libav.ffm
 ret: 0 st: 0 dts:0.040000 pts:0.040000 pos:8192 size:24795 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:376832 size:208 flags:1
@@ -2854,7 +2854,7 @@ ret:-11
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret:-11
 ----------------
-data/b-libav.flv
+tests/data/b-libav.flv
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:31385 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:31385 flags:1
@@ -2900,7 +2900,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:150381 size:30541 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav.gif
+tests/data/b-libav.gif
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:2906382 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -2929,9 +2929,9 @@ ret:-1 st: 0 ts:1.560000 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav-gray.yuv
+tests/data/b-libav-gray.yuv
 ----------------
-data/b-libav.gxf
+tests/data/b-libav.gxf
 ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:748 size:55568 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:56348 size:65536 flags:1
@@ -2986,7 +2986,7 @@ ret: 0 st: 0 dts:0.480000 pts:-184467440737095520.000000 pos:376324 size:54324 f
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:748 size:55568 flags:1
 ----------------
-data/b-libav.mmf
+tests/data/b-libav.mmf
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:4096 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3015,11 +3015,11 @@ ret:-1 st: 0 ts:1.565850 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav-monob.yuv
+tests/data/b-libav-monob.yuv
 ----------------
-data/b-libav-monow.yuv
+tests/data/b-libav-monow.yuv
 ----------------
-data/b-libav.mov
+tests/data/b-libav.mov
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
@@ -3065,7 +3065,7 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:166272 size:27412 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav.mpg
+tests/data/b-libav.mpg
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
@@ -3120,9 +3120,9 @@ ret: 0 st: 0 dts:0.500000 pts:0.540000 pos:-1 size:16335 flags:0
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ----------------
-data/b-libav-pal8.yuv
+tests/data/b-libav-pal8.yuv
 ----------------
-data/b-libav.pbm
+tests/data/b-libav.pbm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:317075 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3151,7 +3151,7 @@ ret:-1 st: 0 ts:1.560000 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav.pgm
+tests/data/b-libav.pgm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:2534775 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3180,7 +3180,7 @@ ret:-1 st: 0 ts:1.560000 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav.ppm
+tests/data/b-libav.ppm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:7603575 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3209,15 +3209,15 @@ ret:-1 st: 0 ts:1.560000 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav-rgb24.yuv
+tests/data/b-libav-rgb24.yuv
 ----------------
-data/b-libav-rgb32.yuv
+tests/data/b-libav-rgb32.yuv
 ----------------
-data/b-libav-rgb555.yuv
+tests/data/b-libav-rgb555.yuv
 ----------------
-data/b-libav-rgb565.yuv
+tests/data/b-libav-rgb565.yuv
 ----------------
-data/b-libav.rm
+tests/data/b-libav.rm
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:394 size:31384 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:31790 size:278 flags:1
@@ -3272,7 +3272,7 @@ ret: 0 st: 1 dts:0.487000 pts:0.487000 pos:191474 size:278 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:31790 size:278 flags:1
 ----------------
-data/b-libav.swf
+tests/data/b-libav.swf
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:65 size:31385 flags:0
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3301,7 +3301,7 @@ ret:-1 st: 0 ts:1.560000 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav.ts
+tests/data/b-libav.ts
 ret: 0 st: 0 dts:-0.040000 pts:0.000000 pos:-1 size:24921 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:-1 size:22036 flags:1
@@ -3356,9 +3356,9 @@ ret: 0 st: 0 dts:0.440000 pts:0.480000 pos:-1 size:21317 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:-1 size:22036 flags:1
 ----------------
-data/b-libav.ul
+tests/data/b-libav.ul
 ----------------
-data/b-libav.voc
+tests/data/b-libav.voc
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:32 size:512 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3387,7 +3387,7 @@ ret:-1 st: 0 ts:1.565844 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav.wav
+tests/data/b-libav.wav
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-1.000000 pts:-1.000000 pos:32768 size:4096 flags:1
@@ -3442,7 +3442,7 @@ ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40616 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73384 size:4096 flags:1
 ----------------
-data/b-libav.y4m
+tests/data/b-libav.y4m
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:66 size:152064 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
@@ -3471,20 +3471,20 @@ ret:-1 st: 0 ts:1.560000 flags:1
 ret:-1 st:-1 ts:0.460008 flags:0
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-data/b-libav-yuv410p.yuv
+tests/data/b-libav-yuv410p.yuv
 ----------------
-data/b-libav-yuv411p.yuv
+tests/data/b-libav-yuv411p.yuv
 ----------------
-data/b-libav-yuv420p.yuv
+tests/data/b-libav-yuv420p.yuv
 ----------------
-data/b-libav-yuv422p.yuv
+tests/data/b-libav-yuv422p.yuv
 ----------------
-data/b-libav-yuv444p.yuv
+tests/data/b-libav-yuv444p.yuv
 ----------------
-data/b-libav-yuvj420p.yuv
+tests/data/b-libav-yuvj420p.yuv
 ----------------
-data/b-libav-yuvj422p.yuv
+tests/data/b-libav-yuvj422p.yuv
 ----------------
-data/b-libav-yuvj444p.yuv
+tests/data/b-libav-yuvj444p.yuv
 ----------------
-data/b-libav-yuyv422.yuv
+tests/data/b-libav-yuyv422.yuv
diff --git a/tests/seek_test.sh b/tests/seek_test.sh
index 51c72ed133..9f07f31268 100755
--- a/tests/seek_test.sh
+++ b/tests/seek_test.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-datadir="./data"
+datadir="tests/data"
 
 logfile="$datadir/seek.regression"
 reffile="$1"
 
-list=`ls data/a-* data/b-* | sort`
+list=`ls tests/data/a-* tests/data/b-* | sort`
 rm -f $logfile
 for i in $list ; do
     echo ---------------- >> $logfile
     echo $i >> $logfile
     echo $i | grep -v 'b-libav[01][0-9][.]' 2> /dev/null &&
-    ./seek_test $i >> $logfile
+    tests/seek_test $i >> $logfile
 done
 
 if diff -u "$reffile" "$logfile" ; then
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index 290afd0ce7..244b985923 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -8,23 +8,23 @@ else
 fi
 
 # Make sure that the data directory exists
-mkdir -p data
+mkdir -p tests/data
 
-#perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
-#perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
+#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf
+#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf
 
 FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
 
-rm -f feed1.ffm
-../ffserver -d -f test.conf 2> /dev/null &
+rm -f tests/feed1.ffm
+./ffserver -d -f tests/test.conf 2> /dev/null &
 FFSERVER_PID=$!
 sleep 2
 echo "Waiting for feeds to startup..."
-../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null &
+./ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null &
 FFMPEG_PID=$!
 sleep 5
 (
-    cd data || exit $?
+    cd tests/data || exit $?
     rm -f ff-*;
     WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off"
     for file in $FILES; do
@@ -42,8 +42,8 @@ sleep 5
 kill $FFMPEG_PID
 kill $FFSERVER_PID
 wait > /dev/null 2>&1
-rm -f feed1.ffm
-if $diff_cmd data/ffserver.regression "$1" ; then
+rm -f tests/feed1.ffm
+if $diff_cmd tests/data/ffserver.regression "$1" ; then
     echo
     echo Server regression test succeeded.
     exit 0