-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,RAWVIDEO) += rgb yuv
+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