diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 667e3759a5..6f49ffed40 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -10,7 +10,7 @@ fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECO
 fate-vsynth%: CMP_UNIT = 1
 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
 
-FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv
+FATE_VCODEC_SCALE-$(call ENCDEC, AMV, AVI) += amv
 fate-vsynth%-amv:                ENCOPTS = -strict -1
 
 FATE_VCODEC-$(call ENCDEC, ASV1, AVI)   += asv1
@@ -19,16 +19,17 @@ fate-vsynth%-asv1:               ENCOPTS = -qscale 10
 FATE_VCODEC-$(call ENCDEC, ASV2, AVI)   += asv2
 fate-vsynth%-asv2:               ENCOPTS = -qscale 10
 
-FATE_VCODEC-$(call ENCDEC, CINEPAK, AVI) += cinepak
+FATE_VCODEC_SCALE-$(call ENCDEC, CINEPAK, AVI) += cinepak
 fate-vsynth%-cinepak:            ENCOPTS = -s sqcif -strip_number_adaptivity 1
 
-FATE_VCODEC-$(call ENCDEC, CLJR, AVI)   += cljr
+FATE_VCODEC_SCALE-$(call ENCDEC, CLJR, AVI)   += cljr
 fate-vsynth%-cljr:               ENCOPTS = -strict -1
 
-FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \
-                                              vc2-422p vc2-422p10 vc2-422p12 \
-                                              vc2-444p vc2-444p10 vc2-444p12 \
-                                              vc2-thaar vc2-t5_3
+FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p
+FATE_VCODEC_SCALE-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p10 vc2-420p12 \
+                                                    vc2-422p vc2-422p10 vc2-422p12 \
+                                                    vc2-444p vc2-444p10 vc2-444p12 \
+                                                    vc2-thaar vc2-t5_3
 fate-vsynth1-vc2-4%:             FMT      = mov
 fate-vsynth1-vc2-4%:             ENCOPTS = -pix_fmt yuv$(@:fate-vsynth1-vc2-%=%) \
                                            -c:v vc2 -frames 5 -strict -1
@@ -57,7 +58,7 @@ FATE_VCODEC_DNXHD_DNXHD := dnxhd-720p                  \
                                                        dnxhd-2k-hr-hq   \
                                                        dnxhd-uhd-hr-sq) \
 
-FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD)
+FATE_VCODEC_SCALE-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD)
 
 fate-vsynth%-dnxhd-720p:         ENCOPTS = -s hd720 -b 90M              \
                                            -pix_fmt yuv422p -frames 5 -qmax 8
@@ -102,7 +103,7 @@ $(FATE_VCODEC_DNXHD_DNXHD:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE)
 FATE_VCODEC_DNXHD_MOV := dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr  \
                          dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov \
 
-FATE_VCODEC-$(call ENCDEC, DNXHD, MOV)  += $(FATE_VCODEC_DNXHD_MOV)
+FATE_VCODEC_SCALE-$(call ENCDEC, DNXHD, MOV)  += $(FATE_VCODEC_DNXHD_MOV)
 fate-vsynth%-dnxhd-1080i:        ENCOPTS = -s hd1080 -b 120M -flags +ildct \
                                            -pix_fmt yuv422p -frames 5 -qmax 8
 
@@ -130,7 +131,7 @@ $(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): FMT      = mov
 $(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE)
 
 FATE_VCODEC_DV := dv dv-411 dv-50 dv-hd dv-fhd
-FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV)
+FATE_VCODEC_SCALE-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV)
 fate-vsynth%-dv:                 ENCOPTS = -dct int -s pal
 
 fate-vsynth%-dv-411:             ENCOPTS = -dct int -s pal -pix_fmt yuv411p \
@@ -154,8 +155,9 @@ $(FATE_VCODEC_DV:%=fate-vsynth\%-%): FMT      = dv
 $(FATE_VCODEC_DV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE)
 
 FATE_VCODEC-$(call ENCDEC, FFV1, AVI)   += ffv1 ffv1-v0 \
-                                           ffv1-v3-yuv420p ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \
-                                           ffv1-v3-bgr0 ffv1-v3-rgb48
+                                           ffv1-v3-yuv420p
+FATE_VCODEC_SCALE-$(call ENCDEC, FFV1, AVI) += ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \
+                                               ffv1-v3-bgr0 ffv1-v3-rgb48
 fate-vsynth%-ffv1:               ENCOPTS = -slices 4
 fate-vsynth%-ffv1-v0:            CODEC   = ffv1
 fate-vsynth%-ffv1-v3-yuv420p:    ENCOPTS = -level 3 -pix_fmt yuv420p
@@ -172,18 +174,19 @@ fate-vsynth%-ffv1-v3-rgb48:      ENCOPTS = -level 3 -pix_fmt rgb48 -strict -2 \
                                            -sws_flags neighbor+bitexact
 fate-vsynth%-ffv1-v3-rgb48:      DECOPTS = -sws_flags neighbor+bitexact
 
-FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16
+FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff
+FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16
 fate-vsynth%-ffvhuff444:         ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p
 fate-vsynth%-ffvhuff420p12:      ENCOPTS = -c:v ffvhuff -pix_fmt yuv420p12le
 fate-vsynth%-ffvhuff422p10left:  ENCOPTS = -c:v ffvhuff -pix_fmt yuv422p10le -pred left
 fate-vsynth%-ffvhuff444p16:      ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p16le -pred plane
 
-FATE_VCODEC-$(call ENCDEC, FLASHSV, FLV) += flashsv
+FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV, FLV) += flashsv
 fate-vsynth%-flashsv:            ENCOPTS = -sws_flags neighbor+full_chroma_int
 fate-vsynth%-flashsv:            DECOPTS = -sws_flags area
 fate-vsynth%-flashsv:            FMT     = flv
 
-FATE_VCODEC-$(call ENCDEC, FLASHSV2, FLV) += flashsv2
+FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV2, FLV) += flashsv2
 fate-vsynth%-flashsv2:           ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0
 fate-vsynth%-flashsv2:           DECOPTS = -sws_flags area
 fate-vsynth%-flashsv2:           FMT     = flv
@@ -201,7 +204,7 @@ fate-vsynth%-h263:               ENCOPTS = -qscale 10
 fate-vsynth%-h263-obmc:          ENCOPTS = -qscale 10 -obmc 1
 fate-vsynth%-h263p:              ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300
 
-FATE_VCODEC-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra
+FATE_VCODEC_SCALE-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra
 fate-vsynth%-huffyuv:            ENCOPTS = -c:v huffyuv -pix_fmt yuv422p -sws_flags neighbor
 fate-vsynth%-huffyuv:            DECOPTS = -sws_flags neighbor
 fate-vsynth%-huffyuvbgr24:       ENCOPTS = -c:v huffyuv -pix_fmt bgr24 -sws_flags neighbor
@@ -209,11 +212,11 @@ fate-vsynth%-huffyuvbgr24:       DECOPTS = -sws_flags neighbor
 fate-vsynth%-huffyuvbgra:        ENCOPTS = -c:v huffyuv -pix_fmt bgr32 -sws_flags neighbor
 fate-vsynth%-huffyuvbgra:        DECOPTS = -sws_flags neighbor
 
-FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls
+FATE_VCODEC_SCALE-$(call ENCDEC, JPEGLS, AVI) += jpegls
 fate-vsynth%-jpegls:             ENCOPTS = -sws_flags neighbor+full_chroma_int
 fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
 
-FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
+FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
 fate-vsynth%-jpeg2000:                ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
 fate-vsynth%-jpeg2000:                DECINOPTS = -c:v jpeg2000
 fate-vsynth%-jpeg2000-97:             ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
@@ -222,7 +225,7 @@ fate-vsynth%-jpeg2000-97:             DECINOPTS = -c:v jpeg2000
 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
 fate-vsynth%-ljpeg:              ENCOPTS = -strict -1
 
-FATE_VCODEC-$(call ENCDEC, MJPEG, AVI)  += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman
+FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI)  += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman
 fate-vsynth%-mjpeg:                   ENCOPTS = -qscale 9 -pix_fmt yuvj420p
 fate-vsynth%-mjpeg-422:               ENCOPTS = -qscale 9 -pix_fmt yuvj422p
 fate-vsynth%-mjpeg-444:               ENCOPTS = -qscale 9 -pix_fmt yuvj444p
@@ -239,8 +242,8 @@ fate-vsynth%-mpeg1b:             CODEC   = mpeg1video
 fate-vsynth%-mpeg1b:             ENCOPTS = -qscale 8 -bf 3 -ps 200
 fate-vsynth%-mpeg1b:             FMT     = mpeg1video
 
-FATE_MPEG2 = mpeg2                                                      \
-             mpeg2-422                                                  \
+FATE_MPEG2 := mpeg2                                                     \
+              $(if $(CONFIG_SCALE_FILTER), mpeg2-422)                   \
              mpeg2-idct-int                                             \
              mpeg2-ilace                                                \
              mpeg2-ivlc-qprd                                            \
@@ -332,12 +335,12 @@ fate-vsynth%-msmpeg4:            ENCOPTS = -qscale 10
 FATE_VCODEC-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2
 fate-vsynth%-msmpeg4v2:          ENCOPTS = -qscale 10
 
-FATE_VCODEC-$(call ENCDEC, PNG, AVI)    += mpng
+FATE_VCODEC_SCALE-$(call ENCDEC, PNG, AVI) += mpng
 fate-vsynth%-mpng:               CODEC   = png
 
-FATE_VCODEC-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1
+FATE_VCODEC_SCALE-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1
 
-FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_int prores_444 prores_444_int prores_ks
+FATE_VCODEC_SCALE-$(call ENCDEC, PRORES, MOV) += prores prores_int prores_444 prores_444_int prores_ks
 fate-vsynth%-prores:             FMT     = mov
 
 fate-vsynth%-prores_int:         CODEC   = prores
@@ -355,14 +358,14 @@ fate-vsynth%-prores_444_int:     FMT     = mov
 fate-vsynth%-prores_ks:          ENCOPTS = -profile hq
 fate-vsynth%-prores_ks:          FMT     = mov
 
-FATE_VCODEC-$(call ENCDEC, QTRLE, MOV)  += qtrle qtrlegray
+FATE_VCODEC_SCALE-$(call ENCDEC, QTRLE, MOV)  += qtrle qtrlegray
 fate-vsynth%-qtrle:              FMT     = mov
 
 fate-vsynth%-qtrlegray:          CODEC   = qtrle
 fate-vsynth%-qtrlegray:          ENCOPTS = -pix_fmt gray
 fate-vsynth%-qtrlegray:          FMT     = mov
 
-FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15
+FATE_VCODEC_SCALE-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15
 fate-vsynth%-rgb:                CODEC   = rawvideo
 fate-vsynth%-rgb:                ENCOPTS = -pix_fmt bgr24
 fate-vsynth%-bpp1:               CODEC   = rawvideo
@@ -370,7 +373,7 @@ fate-vsynth%-bpp1:               ENCOPTS = -pix_fmt monow
 fate-vsynth%-bpp15:              CODEC   = rawvideo
 fate-vsynth%-bpp15:              ENCOPTS = -pix_fmt bgr555le
 
-FATE_VCODEC-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16
+FATE_VCODEC_SCALE-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16
 fate-vsynth%-mov-bgr24:          CODEC   = rawvideo
 fate-vsynth%-mov-bgr24:          ENCOPTS = -pix_fmt bgr24
 fate-vsynth%-mov-bgr24:          FMT      = mov
@@ -381,7 +384,7 @@ fate-vsynth%-mov-bpp16:          CODEC   = rawvideo
 fate-vsynth%-mov-bpp16:          ENCOPTS = -pix_fmt rgb565le
 fate-vsynth%-mov-bpp16:          FMT      = mov
 
-FATE_VCODEC-$(call ENCDEC, ROQ, ROQ)    += roqvideo
+FATE_VCODEC_SCALE-$(call ENCDEC, ROQ, ROQ) += roqvideo
 fate-vsynth%-roqvideo:           CODEC   = roqvideo
 fate-vsynth%-roqvideo:           ENCOPTS = -frames 5
 fate-vsynth%-roqvideo:           RAWDECOPTS = -r 30
@@ -395,7 +398,7 @@ FATE_VCODEC-$(call ENCDEC, RV20, RM)    += rv20
 fate-vsynth%-rv20:               ENCOPTS = -qscale 10
 fate-vsynth%-rv20:               FMT     = rm
 
-FATE_VCODEC-$(call ENCDEC, SNOW, AVI)   += snow snow-hpel snow-ll
+FATE_VCODEC_SCALE-$(call ENCDEC, SNOW, AVI) += snow snow-hpel
 fate-vsynth%-snow:               ENCOPTS = -qscale 2 -flags +qpel \
                                            -motion_est iter -dia_size 2      \
                                            -cmp 12 -subcmp 12 -s 128x64
@@ -405,25 +408,26 @@ fate-vsynth%-snow-hpel:          ENCOPTS = -qscale 2              \
                                            -cmp 12 -subcmp 12 -s 128x64
 fate-vsynth%-snow fate-vsynth%-snow-hpel: DECOPTS = $(DEFAULT_SIZE)
 
+FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow-ll
 fate-vsynth%-snow-ll:            ENCOPTS = -qscale .001 -pred 1 \
                                            -flags +mv4+qpel
 
-FATE_VCODEC-$(call ENCDEC, SVQ1, MOV)   += svq1
+FATE_VCODEC_SCALE-$(call ENCDEC, SVQ1, MOV)   += svq1
 fate-vsynth%-svq1:               ENCOPTS = -qscale 3 -pix_fmt yuv410p
 fate-vsynth%-svq1:               FMT     = mov
 
-FATE_VCODEC-$(call ENCDEC, R210, AVI)   += r210
+FATE_VCODEC_SCALE-$(call ENCDEC, R210, AVI)   += r210
 
-FATE_VCODEC-$(call ENCDEC, V210, AVI)   += v210 v210-10
+FATE_VCODEC_SCALE-$(call ENCDEC, V210, AVI)   += v210 v210-10
 fate-vsynth%-v210-10:            ENCOPTS = -pix_fmt yuv422p10
 
-FATE_VCODEC-$(call ENCDEC, V308, AVI)   += v308
+FATE_VCODEC_SCALE-$(call ENCDEC, V308, AVI)   += v308
 
-FATE_VCODEC-$(call ENCDEC, V408, AVI)   += v408
+FATE_VCODEC_SCALE-$(call ENCDEC, V408, AVI)   += v408
 fate-vsynth%-v408:               ENCOPTS = -sws_flags neighbor+bitexact
 fate-vsynth%-v408:               DECOPTS = -sws_flags neighbor+bitexact
 
-FATE_VCODEC-$(call ENCDEC, AVUI, MOV)   += avui
+FATE_VCODEC_SCALE-$(call ENCDEC, AVUI, MOV)   += avui
 fate-vsynth%-avui:               ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact
 fate-vsynth%-avui:               DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE)
 fate-vsynth%-avui:               FMT     = mov
@@ -437,18 +441,20 @@ fate-vsynth%-wmv2:               ENCOPTS = -qscale 10
 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv
 fate-vsynth%-yuv:                CODEC = rawvideo
 
-FATE_VCODEC-$(call ENCDEC, XFACE, NUT) += xface
+FATE_VCODEC_SCALE-$(call ENCDEC, XFACE, NUT) += xface
 fate-vsynth%-xface:              ENCOPTS = -s 48x48 -sws_flags neighbor+bitexact
 fate-vsynth%-xface:              DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE)
 fate-vsynth%-xface:              FMT = nut
 
 FATE_VCODEC-$(call ENCDEC, YUV4, AVI) += yuv4
 
-FATE_VCODEC-$(call ENCDEC, Y41P, AVI) += y41p
+FATE_VCODEC_SCALE-$(call ENCDEC, Y41P, AVI) += y41p
 
-FATE_VCODEC-$(call ENCDEC, ZLIB, AVI) += zlib
+FATE_VCODEC_SCALE-$(call ENCDEC, ZLIB, AVI) += zlib
 
+FATE_VCODEC-$(CONFIG_SCALE_FILTER) += $(FATE_VCODEC_SCALE-yes)
 FATE_VCODEC += $(FATE_VCODEC-yes)
+FATE_VCODEC := $(if $(call ENCDEC, RAWVIDEO, RAWVIDEO),$(FATE_VCODEC))
 FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%)
 FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%)
 FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%)
