diff --git a/Makefile b/Makefile
index ff198e8f48..d51610d2a5 100644
--- a/Makefile
+++ b/Makefile
@@ -155,44 +155,46 @@ SEEK_REFFILE     = $(SRC_PATH)/tests/seek.regression.ref
 ENCDEC = $(and $(CONFIG_$(1)_ENCODER),$(CONFIG_$(1)_DECODER))
 MUXDEM = $(and $(CONFIG_$(1)_MUXER),$(CONFIG_$(or $(2),$(1))_DEMUXER))
 
-CODEC_TESTS =
-CODEC_TESTS-$(call ENCDEC,AC3)               += ac3
-CODEC_TESTS-$(call ENCDEC,ADPCM_G726)        += g726
-CODEC_TESTS-$(call ENCDEC,ADPCM_IMA_QT)      += adpcm_ima_qt
-CODEC_TESTS-$(call ENCDEC,ADPCM_IMA_WAV)     += adpcm_ima_wav
-CODEC_TESTS-$(call ENCDEC,ADPCM_MS)          += adpcm_ms
-CODEC_TESTS-$(call ENCDEC,ADPCM_SWF)         += adpcm_swf
-CODEC_TESTS-$(call ENCDEC,ADPCM_YAMAHA)      += adpcm_yam
-CODEC_TESTS-$(call ENCDEC,ALAC)              += alac
-CODEC_TESTS-$(call ENCDEC,ASV1)              += asv1
-CODEC_TESTS-$(call ENCDEC,ASV2)              += asv2
-CODEC_TESTS-$(call ENCDEC,DNXHD)             += dnxhd_1080i dnxhd_720p dnxhd_720p_rd
-CODEC_TESTS-$(call ENCDEC,DVVIDEO)           += dv dv50
-CODEC_TESTS-$(call ENCDEC,FFV1)              += ffv1
-CODEC_TESTS-$(call ENCDEC,FLAC)              += flac
-CODEC_TESTS-$(call ENCDEC,FLASHSV)           += flashsv
-CODEC_TESTS-$(call ENCDEC,FLV)               += flv
-CODEC_TESTS-$(call ENCDEC,H261)              += h261
-CODEC_TESTS-$(call ENCDEC,H263)              += h263 h263p
-CODEC_TESTS-$(call ENCDEC,HUFFYUV)           += huffyuv
-CODEC_TESTS-$(call ENCDEC,JPEGLS)            += jpegls
-CODEC_TESTS-$(call ENCDEC,MJPEG)             += mjpeg ljpeg
-CODEC_TESTS-$(call ENCDEC,MP2)               += mp2
-CODEC_TESTS-$(call ENCDEC,MPEG1VIDEO)        += mpeg mpeg1b
-CODEC_TESTS-$(call ENCDEC,MPEG2VIDEO)        += mpeg2 mpeg2thread
-CODEC_TESTS-$(call ENCDEC,MPEG4)             += mpeg4 mpeg4adv mpeg4nr mpeg4thread error rc
-CODEC_TESTS-$(call ENCDEC,MSMPEG4V1)         += msmpeg4
-CODEC_TESTS-$(call ENCDEC,MSMPEG4V2)         += msmpeg4v2
-CODEC_TESTS-$(call ENCDEC,PCM_S16LE)         += pcm         # fixme
-CODEC_TESTS-$(call ENCDEC,ROQ)               += roq
-CODEC_TESTS-$(call ENCDEC,RV10)              += rv10
-CODEC_TESTS-$(call ENCDEC,RV20)              += rv20
-CODEC_TESTS-$(call ENCDEC,SNOW)              += snow snowll
-CODEC_TESTS-$(call ENCDEC,SVQ1)              += svq1
-CODEC_TESTS-$(call ENCDEC,WMAV1)             += wmav1
-CODEC_TESTS-$(call ENCDEC,WMAV1)             += wmav2
-CODEC_TESTS-$(call ENCDEC,WMV1)              += wmv1
-CODEC_TESTS-$(call ENCDEC,WMV2)              += wmv2
+VCODEC_TESTS =
+VCODEC_TESTS-$(call ENCDEC,ASV1)             += asv1
+VCODEC_TESTS-$(call ENCDEC,ASV2)             += asv2
+VCODEC_TESTS-$(call ENCDEC,DNXHD)            += dnxhd_1080i dnxhd_720p dnxhd_720p_rd
+VCODEC_TESTS-$(call ENCDEC,DVVIDEO)          += dv dv50
+VCODEC_TESTS-$(call ENCDEC,FFV1)             += ffv1
+VCODEC_TESTS-$(call ENCDEC,FLASHSV)          += flashsv
+VCODEC_TESTS-$(call ENCDEC,FLV)              += flv
+VCODEC_TESTS-$(call ENCDEC,H261)             += h261
+VCODEC_TESTS-$(call ENCDEC,H263)             += h263 h263p
+VCODEC_TESTS-$(call ENCDEC,HUFFYUV)          += huffyuv
+VCODEC_TESTS-$(call ENCDEC,JPEGLS)           += jpegls
+VCODEC_TESTS-$(call ENCDEC,MJPEG)            += mjpeg ljpeg
+VCODEC_TESTS-$(call ENCDEC,MPEG1VIDEO)       += mpeg mpeg1b
+VCODEC_TESTS-$(call ENCDEC,MPEG2VIDEO)       += mpeg2 mpeg2thread
+VCODEC_TESTS-$(call ENCDEC,MPEG4)            += mpeg4 mpeg4adv mpeg4nr mpeg4thread error rc
+VCODEC_TESTS-$(call ENCDEC,MSMPEG4V1)        += msmpeg4
+VCODEC_TESTS-$(call ENCDEC,MSMPEG4V2)        += msmpeg4v2
+VCODEC_TESTS-$(call ENCDEC,ROQ)              += roq
+VCODEC_TESTS-$(call ENCDEC,RV10)             += rv10
+VCODEC_TESTS-$(call ENCDEC,RV20)             += rv20
+VCODEC_TESTS-$(call ENCDEC,SNOW)             += snow snowll
+VCODEC_TESTS-$(call ENCDEC,SVQ1)             += svq1
+VCODEC_TESTS-$(call ENCDEC,WMV1)             += wmv1
+VCODEC_TESTS-$(call ENCDEC,WMV2)             += wmv2
+
+ACODEC_TESTS =
+ACODEC_TESTS-$(call ENCDEC,AC3)              += ac3
+ACODEC_TESTS-$(call ENCDEC,ADPCM_G726)       += g726
+ACODEC_TESTS-$(call ENCDEC,ADPCM_IMA_QT)     += adpcm_ima_qt
+ACODEC_TESTS-$(call ENCDEC,ADPCM_IMA_WAV)    += adpcm_ima_wav
+ACODEC_TESTS-$(call ENCDEC,ADPCM_MS)         += adpcm_ms
+ACODEC_TESTS-$(call ENCDEC,ADPCM_SWF)        += adpcm_swf
+ACODEC_TESTS-$(call ENCDEC,ADPCM_YAMAHA)     += adpcm_yam
+ACODEC_TESTS-$(call ENCDEC,ALAC)             += alac
+ACODEC_TESTS-$(call ENCDEC,FLAC)             += flac
+ACODEC_TESTS-$(call ENCDEC,MP2)              += mp2
+ACODEC_TESTS-$(call ENCDEC,PCM_S16LE)        += pcm         # fixme
+ACODEC_TESTS-$(call ENCDEC,WMAV1)            += wmav1
+ACODEC_TESTS-$(call ENCDEC,WMAV1)            += wmav2
 
 LAVF_TESTS =
 LAVF_TESTS-$(call MUXDEM,AIFF)               += aiff
@@ -232,16 +234,21 @@ LAVF_TESTS-$(call MUXDEM,YUV4MPEGPIPE)       += yuv4mpeg
 
 LAVFI_TESTS =
 
-CODEC_TESTS := $(addprefix regtest-, $(CODEC_TESTS) $(CODEC_TESTS-yes))
+ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
+VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes))
 LAVF_TESTS  := $(addprefix regtest-, $(LAVF_TESTS)  $(LAVF_TESTS-yes))
 LAVFI_TESTS := $(addprefix regtest-, $(LAVFI_TESTS) $(LAVFI_TESTS-yes))
 
+CODEC_TESTS = $(VCODEC_TESTS) $(ACODEC_TESTS)
+
 codectest: $(CODEC_TESTS)
 lavftest:  $(LAVF_TESTS)
 
 # lavfitest: $(LAVFI_TESTS)
 
-$(CODEC_TESTS) $(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref
+$(ACODEC_TESTS): regtest-aref
+$(VCODEC_TESTS): regtest-vref
+$(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref
 
 REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%)
 RESFILE = tests/data/$(2:regtest-%=%).$(1).regression
@@ -251,15 +258,25 @@ define CODECTEST_CMD
 	$(SRC_PATH)/tests/codec-regression.sh $@ vsynth2 tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
 endef
 
-regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/data/asynth1.sw
+regtest-ref: regtest-aref regtest-vref
+
+regtest-vref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
 	$(CODECTEST_CMD)
 
-$(CODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
-	@echo "TEST CODEC $(@:regtest-%=%)"
+regtest-aref: ffmpeg$(EXESUF) tests/data/asynth1.sw
+	@$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec a "$(TARGET_EXEC)" "$(TARGET_PATH)"
+
+$(VCODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
+	@echo "TEST VCODEC $(@:regtest-%=%)"
 	@$(CODECTEST_CMD)
 	@diff -u -w $(call REFFILE,vsynth1,$@) $(call RESFILE,vsynth1,$@)
 	@diff -u -w $(call REFFILE,vsynth2,$@) $(call RESFILE,vsynth2,$@)
 
+$(ACODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
+	@echo "TEST ACODEC $(@:regtest-%=%)"
+	@$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec a "$(TARGET_EXEC)" "$(TARGET_PATH)"
+	@diff -u -w $(call REFFILE,acodec,$@) $(call RESFILE,acodec,$@)
+
 $(LAVF_TESTS):
 	@echo "TEST LAVF  $(@:regtest-%=%)"
 	@$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 53d1cd316b..8eb13eeabc 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -15,8 +15,10 @@ rm -f "$logfile"
 rm -f "$benchfile"
 
 # generate reference for quality check
-if [ -n "$do_ref" ]; then
+if [ -n "$do_vref" ]; then
 do_ffmpeg_nocheck $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo $target_path/$raw_ref
+fi
+if [ -n "$do_aref" ]; then
 do_ffmpeg_nocheck $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav $target_path/$pcm_ref
 fi
 
diff --git a/tests/ref/vsynth1/ac3 b/tests/ref/acodec/ac3
similarity index 100%
rename from tests/ref/vsynth1/ac3
rename to tests/ref/acodec/ac3
diff --git a/tests/ref/vsynth1/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt
similarity index 66%
rename from tests/ref/vsynth1/adpcm_ima_qt
rename to tests/ref/acodec/adpcm_ima_qt
index 74fc3a2409..76a244c571 100644
--- a/tests/ref/vsynth1/adpcm_ima_qt
+++ b/tests/ref/acodec/adpcm_ima_qt
@@ -1,4 +1,4 @@
 3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
 281252 ./tests/data/a-adpcm_qt.aiff
-9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.vsynth1.out.wav
+9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.acodec.out.wav
 stddev:  914.63 PSNR: 37.10 bytes:  1058604/  1058444
diff --git a/tests/ref/vsynth2/adpcm_ima_wav b/tests/ref/acodec/adpcm_ima_wav
similarity index 66%
rename from tests/ref/vsynth2/adpcm_ima_wav
rename to tests/ref/acodec/adpcm_ima_wav
index df14230d34..c4f4b8d541 100644
--- a/tests/ref/vsynth2/adpcm_ima_wav
+++ b/tests/ref/acodec/adpcm_ima_wav
@@ -1,4 +1,4 @@
 56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
 267324 ./tests/data/a-adpcm_ima.wav
-78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.vsynth2.out.wav
+78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.acodec.out.wav
 stddev:  903.51 PSNR: 37.21 bytes:  1061792/  1058444
diff --git a/tests/ref/vsynth2/adpcm_ms b/tests/ref/acodec/adpcm_ms
similarity index 67%
rename from tests/ref/vsynth2/adpcm_ms
rename to tests/ref/acodec/adpcm_ms
index eaf4623c5e..cb50f0ac60 100644
--- a/tests/ref/vsynth2/adpcm_ms
+++ b/tests/ref/acodec/adpcm_ms
@@ -1,4 +1,4 @@
 a407b87daeef5b25dfb6c5b3f519e9c1 *./tests/data/a-adpcm_ms.wav
 268378 ./tests/data/a-adpcm_ms.wav
-7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.vsynth2.out.wav
+7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.acodec.out.wav
 stddev: 1050.00 PSNR: 35.91 bytes:  1060620/  1058444
diff --git a/tests/ref/vsynth2/adpcm_swf b/tests/ref/acodec/adpcm_swf
similarity index 67%
rename from tests/ref/vsynth2/adpcm_swf
rename to tests/ref/acodec/adpcm_swf
index 148bdb2096..ffce37c529 100644
--- a/tests/ref/vsynth2/adpcm_swf
+++ b/tests/ref/acodec/adpcm_swf
@@ -1,4 +1,4 @@
 42d4639866ed4d692eaf126228a4fa2a *./tests/data/a-adpcm_swf.flv
 269166 ./tests/data/a-adpcm_swf.flv
-628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.vsynth2.out.wav
+628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.acodec.out.wav
 stddev:  933.65 PSNR: 36.93 bytes:  1065004/  1058444
diff --git a/tests/ref/vsynth1/adpcm_yam b/tests/ref/acodec/adpcm_yam
similarity index 67%
rename from tests/ref/vsynth1/adpcm_yam
rename to tests/ref/acodec/adpcm_yam
index 9c325e1a69..166b9b49b0 100644
--- a/tests/ref/vsynth1/adpcm_yam
+++ b/tests/ref/acodec/adpcm_yam
@@ -1,4 +1,4 @@
 2546d72df736b5ffa1557e8c9c9ef788 *./tests/data/a-adpcm_yam.wav
 266296 ./tests/data/a-adpcm_yam.wav
-c80c847a53a0fee17a88fa889ec34a4e *./tests/data/adpcm_yam.vsynth1.out.wav
+c80c847a53a0fee17a88fa889ec34a4e *./tests/data/adpcm_yam.acodec.out.wav
 stddev: 1247.64 PSNR: 34.41 bytes:  1065004/  1058444
diff --git a/tests/ref/vsynth1/alac b/tests/ref/acodec/alac
similarity index 67%
rename from tests/ref/vsynth1/alac
rename to tests/ref/acodec/alac
index a8d0aeced8..b9b8955e29 100644
--- a/tests/ref/vsynth1/alac
+++ b/tests/ref/acodec/alac
@@ -1,4 +1,4 @@
 c68f649777ab8e7c9a0f1f221451d3ad *./tests/data/a-alac.m4a
 389386 ./tests/data/a-alac.m4a
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/alac.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/alac.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
diff --git a/tests/ref/vsynth1/flac b/tests/ref/acodec/flac
similarity index 68%
rename from tests/ref/vsynth1/flac
rename to tests/ref/acodec/flac
index eee1dc8c04..2a1982a436 100644
--- a/tests/ref/vsynth1/flac
+++ b/tests/ref/acodec/flac
@@ -1,4 +1,4 @@
 7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
 353368 ./tests/data/a-flac.flac
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
diff --git a/tests/ref/vsynth1/g726 b/tests/ref/acodec/g726
similarity index 67%
rename from tests/ref/vsynth1/g726
rename to tests/ref/acodec/g726
index 038d107ae9..a57cd36a65 100644
--- a/tests/ref/vsynth1/g726
+++ b/tests/ref/acodec/g726
@@ -1,4 +1,4 @@
 5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
 24082 ./tests/data/a-g726.wav
-4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.vsynth1.out.wav
+4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.acodec.out.wav
 stddev: 8506.46 PSNR: 17.73 bytes:    96148/  1058444
diff --git a/tests/ref/vsynth1/mp2 b/tests/ref/acodec/mp2
similarity index 74%
rename from tests/ref/vsynth1/mp2
rename to tests/ref/acodec/mp2
index 9bb57ac2ca..5974aab047 100644
--- a/tests/ref/vsynth1/mp2
+++ b/tests/ref/acodec/mp2
@@ -1,5 +1,5 @@
 f6eb0a205350bbd7fb1028a01c7ae8aa *./tests/data/a-mp2.mp2
 96130 ./tests/data/a-mp2.mp2
-74c7b6b15a001add199619fafe4059a1 *./tests/data/mp2.vsynth1.out.wav
+74c7b6b15a001add199619fafe4059a1 *./tests/data/mp2.acodec.out.wav
 stddev: 9315.80 PSNR: 16.94 bytes:  1059884/  1058444
 stddev: 4385.25 PSNR: 23.49 bytes:  1057960/  1058444
diff --git a/tests/ref/vsynth1/pcm b/tests/ref/acodec/pcm
similarity index 69%
rename from tests/ref/vsynth1/pcm
rename to tests/ref/acodec/pcm
index db11e4a313..376de0ab79 100644
--- a/tests/ref/vsynth1/pcm
+++ b/tests/ref/acodec/pcm
@@ -1,72 +1,72 @@
 89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
 529256 ./tests/data/a-pcm_alaw.wav
-0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.vsynth1.out.wav
+0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.acodec.out.wav
 stddev:  101.67 PSNR: 56.19 bytes:  1058444/  1058444
 f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/a-pcm_mulaw.wav
 529256 ./tests/data/a-pcm_mulaw.wav
-1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.vsynth1.out.wav
+1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.acodec.out.wav
 stddev:  103.38 PSNR: 56.04 bytes:  1058444/  1058444
 b7936d7170e0efefb379349d81aed360 *./tests/data/a-pcm_s8.mov
 530837 ./tests/data/a-pcm_s8.mov
-652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.vsynth1.out.wav
+652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.acodec.out.wav
 stddev:  147.89 PSNR: 52.93 bytes:  1058444/  1058444
 98cadb3502dbdc99e6e077c28b1a036c *./tests/data/a-pcm_u8.wav
 529244 ./tests/data/a-pcm_u8.wav
-652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.vsynth1.out.wav
+652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.acodec.out.wav
 stddev:  147.89 PSNR: 52.93 bytes:  1058444/  1058444
 c42b9c04305455250366c84e17c1023f *./tests/data/a-pcm_s16be.mov
 1060037 ./tests/data/a-pcm_s16be.mov
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/a-pcm_s16le.wav
 1058444 ./tests/data/a-pcm_s16le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 2f3e0884e96b984436b1d01200d68871 *./tests/data/a-pcm_s16be.mkv
 1060705 ./tests/data/a-pcm_s16be.mkv
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 c98158732635effefffa006251b9a6c9 *./tests/data/a-pcm_s16le.mkv
 1060705 ./tests/data/a-pcm_s16le.mkv
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/a-pcm_s24be.mov
 1589237 ./tests/data/a-pcm_s24be.mov
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/a-pcm_s24le.wav
 1587668 ./tests/data/a-pcm_s24le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
 2118437 ./tests/data/a-pcm_s32be.mov
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 da6ed80f4f40f0082577dea80827e014 *./tests/data/a-pcm_s32le.wav
 2116868 ./tests/data/a-pcm_s32le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/a-pcm_f32be.au
 2116824 ./tests/data/a-pcm_f32be.au
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 46f44f86a18984a832206ab9e29a79f2 *./tests/data/a-pcm_f32le.wav
 2116880 ./tests/data/a-pcm_f32le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 8112296b1ed94f72f20d04b1a54850a7 *./tests/data/a-pcm_f64be.au
 4233624 ./tests/data/a-pcm_f64be.au
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/a-pcm_f64le.wav
 4233680 ./tests/data/a-pcm_f64le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth1.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 8c74234928ed425b1171211a89f67ead *./tests/data/a-pcm_zork.wav
 529256 ./tests/data/a-pcm_zork.wav
-864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.vsynth1.out.wav
+864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.acodec.out.wav
 stddev:  633.10 PSNR: 40.30 bytes:  1058444/  1058444
 8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
 10368730 ./tests/data/a-pcm_s24daud.302
-f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm.vsynth1.out.wav
+f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm.acodec.out.wav
 stddev: 9415.16 PSNR: 16.85 bytes:  6911864/  1058444
diff --git a/tests/ref/vsynth1/wmav1 b/tests/ref/acodec/wmav1
similarity index 100%
rename from tests/ref/vsynth1/wmav1
rename to tests/ref/acodec/wmav1
diff --git a/tests/ref/vsynth1/wmav2 b/tests/ref/acodec/wmav2
similarity index 100%
rename from tests/ref/vsynth1/wmav2
rename to tests/ref/acodec/wmav2
diff --git a/tests/ref/vsynth1/adpcm_ima_wav b/tests/ref/vsynth1/adpcm_ima_wav
deleted file mode 100644
index 8dafccea26..0000000000
--- a/tests/ref/vsynth1/adpcm_ima_wav
+++ /dev/null
@@ -1,4 +0,0 @@
-56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
-267324 ./tests/data/a-adpcm_ima.wav
-78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.vsynth1.out.wav
-stddev:  903.51 PSNR: 37.21 bytes:  1061792/  1058444
diff --git a/tests/ref/vsynth1/adpcm_ms b/tests/ref/vsynth1/adpcm_ms
deleted file mode 100644
index 503cfe7f04..0000000000
--- a/tests/ref/vsynth1/adpcm_ms
+++ /dev/null
@@ -1,4 +0,0 @@
-a407b87daeef5b25dfb6c5b3f519e9c1 *./tests/data/a-adpcm_ms.wav
-268378 ./tests/data/a-adpcm_ms.wav
-7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.vsynth1.out.wav
-stddev: 1050.00 PSNR: 35.91 bytes:  1060620/  1058444
diff --git a/tests/ref/vsynth1/adpcm_swf b/tests/ref/vsynth1/adpcm_swf
deleted file mode 100644
index a87e14b780..0000000000
--- a/tests/ref/vsynth1/adpcm_swf
+++ /dev/null
@@ -1,4 +0,0 @@
-42d4639866ed4d692eaf126228a4fa2a *./tests/data/a-adpcm_swf.flv
-269166 ./tests/data/a-adpcm_swf.flv
-628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.vsynth1.out.wav
-stddev:  933.65 PSNR: 36.93 bytes:  1065004/  1058444
diff --git a/tests/ref/vsynth2/ac3 b/tests/ref/vsynth2/ac3
deleted file mode 100644
index 8198602652..0000000000
--- a/tests/ref/vsynth2/ac3
+++ /dev/null
@@ -1,2 +0,0 @@
-081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/a-ac3.rm
-98751 ./tests/data/a-ac3.rm
diff --git a/tests/ref/vsynth2/adpcm_ima_qt b/tests/ref/vsynth2/adpcm_ima_qt
deleted file mode 100644
index 8bb2f71833..0000000000
--- a/tests/ref/vsynth2/adpcm_ima_qt
+++ /dev/null
@@ -1,4 +0,0 @@
-3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
-281252 ./tests/data/a-adpcm_qt.aiff
-9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.vsynth2.out.wav
-stddev:  914.63 PSNR: 37.10 bytes:  1058604/  1058444
diff --git a/tests/ref/vsynth2/adpcm_yam b/tests/ref/vsynth2/adpcm_yam
deleted file mode 100644
index de77345200..0000000000
--- a/tests/ref/vsynth2/adpcm_yam
+++ /dev/null
@@ -1,4 +0,0 @@
-2546d72df736b5ffa1557e8c9c9ef788 *./tests/data/a-adpcm_yam.wav
-266296 ./tests/data/a-adpcm_yam.wav
-c80c847a53a0fee17a88fa889ec34a4e *./tests/data/adpcm_yam.vsynth2.out.wav
-stddev: 1247.64 PSNR: 34.41 bytes:  1065004/  1058444
diff --git a/tests/ref/vsynth2/alac b/tests/ref/vsynth2/alac
deleted file mode 100644
index e57cd810ff..0000000000
--- a/tests/ref/vsynth2/alac
+++ /dev/null
@@ -1,4 +0,0 @@
-c68f649777ab8e7c9a0f1f221451d3ad *./tests/data/a-alac.m4a
-389386 ./tests/data/a-alac.m4a
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/alac.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
diff --git a/tests/ref/vsynth2/flac b/tests/ref/vsynth2/flac
deleted file mode 100644
index 515d0078d8..0000000000
--- a/tests/ref/vsynth2/flac
+++ /dev/null
@@ -1,4 +0,0 @@
-7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
-353368 ./tests/data/a-flac.flac
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
diff --git a/tests/ref/vsynth2/g726 b/tests/ref/vsynth2/g726
deleted file mode 100644
index ded1c2ed78..0000000000
--- a/tests/ref/vsynth2/g726
+++ /dev/null
@@ -1,4 +0,0 @@
-5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
-24082 ./tests/data/a-g726.wav
-4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.vsynth2.out.wav
-stddev: 8506.46 PSNR: 17.73 bytes:    96148/  1058444
diff --git a/tests/ref/vsynth2/mp2 b/tests/ref/vsynth2/mp2
deleted file mode 100644
index bf1911a34a..0000000000
--- a/tests/ref/vsynth2/mp2
+++ /dev/null
@@ -1,5 +0,0 @@
-f6eb0a205350bbd7fb1028a01c7ae8aa *./tests/data/a-mp2.mp2
-96130 ./tests/data/a-mp2.mp2
-74c7b6b15a001add199619fafe4059a1 *./tests/data/mp2.vsynth2.out.wav
-stddev: 9315.80 PSNR: 16.94 bytes:  1059884/  1058444
-stddev: 4385.25 PSNR: 23.49 bytes:  1057960/  1058444
diff --git a/tests/ref/vsynth2/pcm b/tests/ref/vsynth2/pcm
deleted file mode 100644
index 9bba936455..0000000000
--- a/tests/ref/vsynth2/pcm
+++ /dev/null
@@ -1,72 +0,0 @@
-89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
-529256 ./tests/data/a-pcm_alaw.wav
-0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.vsynth2.out.wav
-stddev:  101.67 PSNR: 56.19 bytes:  1058444/  1058444
-f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/a-pcm_mulaw.wav
-529256 ./tests/data/a-pcm_mulaw.wav
-1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.vsynth2.out.wav
-stddev:  103.38 PSNR: 56.04 bytes:  1058444/  1058444
-b7936d7170e0efefb379349d81aed360 *./tests/data/a-pcm_s8.mov
-530837 ./tests/data/a-pcm_s8.mov
-652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.vsynth2.out.wav
-stddev:  147.89 PSNR: 52.93 bytes:  1058444/  1058444
-98cadb3502dbdc99e6e077c28b1a036c *./tests/data/a-pcm_u8.wav
-529244 ./tests/data/a-pcm_u8.wav
-652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.vsynth2.out.wav
-stddev:  147.89 PSNR: 52.93 bytes:  1058444/  1058444
-c42b9c04305455250366c84e17c1023f *./tests/data/a-pcm_s16be.mov
-1060037 ./tests/data/a-pcm_s16be.mov
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/a-pcm_s16le.wav
-1058444 ./tests/data/a-pcm_s16le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-2f3e0884e96b984436b1d01200d68871 *./tests/data/a-pcm_s16be.mkv
- 1060705 ./tests/data/a-pcm_s16be.mkv
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-c98158732635effefffa006251b9a6c9 *./tests/data/a-pcm_s16le.mkv
- 1060705 ./tests/data/a-pcm_s16le.mkv
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/a-pcm_s24be.mov
-1589237 ./tests/data/a-pcm_s24be.mov
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/a-pcm_s24le.wav
-1587668 ./tests/data/a-pcm_s24le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
-2118437 ./tests/data/a-pcm_s32be.mov
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-da6ed80f4f40f0082577dea80827e014 *./tests/data/a-pcm_s32le.wav
-2116868 ./tests/data/a-pcm_s32le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/a-pcm_f32be.au
-2116824 ./tests/data/a-pcm_f32be.au
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-46f44f86a18984a832206ab9e29a79f2 *./tests/data/a-pcm_f32le.wav
-2116880 ./tests/data/a-pcm_f32le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-8112296b1ed94f72f20d04b1a54850a7 *./tests/data/a-pcm_f64be.au
-4233624 ./tests/data/a-pcm_f64be.au
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/a-pcm_f64le.wav
-4233680 ./tests/data/a-pcm_f64le.wav
-95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth2.out.wav
-stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-8c74234928ed425b1171211a89f67ead *./tests/data/a-pcm_zork.wav
-529256 ./tests/data/a-pcm_zork.wav
-864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.vsynth2.out.wav
-stddev:  633.10 PSNR: 40.30 bytes:  1058444/  1058444
-8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
-10368730 ./tests/data/a-pcm_s24daud.302
-f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm.vsynth2.out.wav
-stddev: 9415.16 PSNR: 16.85 bytes:  6911864/  1058444
diff --git a/tests/ref/vsynth2/wmav1 b/tests/ref/vsynth2/wmav1
deleted file mode 100644
index 8fdd3ec293..0000000000
--- a/tests/ref/vsynth2/wmav1
+++ /dev/null
@@ -1,4 +0,0 @@
-26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
-106004 ./tests/data/a-wmav1.asf
-stddev:12245.27 PSNR: 14.57 bytes:  1065004/  1058444
-stddev: 2097.78 PSNR: 29.89 bytes:  1056812/  1058444
diff --git a/tests/ref/vsynth2/wmav2 b/tests/ref/vsynth2/wmav2
deleted file mode 100644
index ce8a74a552..0000000000
--- a/tests/ref/vsynth2/wmav2
+++ /dev/null
@@ -1,4 +0,0 @@
-7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
-106044 ./tests/data/a-wmav2.asf
-stddev:12249.69 PSNR: 14.57 bytes:  1065004/  1058444
-stddev: 2091.12 PSNR: 29.92 bytes:  1056812/  1058444
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index a89ab42c2e..c09b39cd49 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -34,6 +34,8 @@ pcm_ref="$datadir/$test_ref.ref.wav"
 crcfile="$datadir/$this.crc"
 target_crcfile="$target_datadir/$this.crc"
 
+mkdir -p "$datadir"
+
 [ "${V-0}" -gt 0 ] && echov=echo || echov=:
 [ "${V-0}" -gt 1 ] || exec 2>$errfile