-FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI)
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RAWVIDEO, AVI) += rgb
-FATE_SEEK_VSYNTH2-$(call ENCDEC, ROQ, ROQ) += roqvideo
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RV10, RM) += rv10
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RV20, RM) += rv20
-FATE_SEEK_VSYNTH2-$(call ENCDEC, SNOW, AVI) += snow
-FATE_SEEK_VSYNTH2-$(call ENCDEC, SNOW, AVI) += snow-ll
-FATE_SEEK_VSYNTH2-$(call ENCDEC, SVQ1, MOV) += svq1
-FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV1, AVI) += wmv1
-FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV2, AVI) += wmv2
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RAWVIDEO, AVI) += yuv
-
-fate-seek-vsynth2-asv1: SRC = fate/vsynth2-asv1.avi
-fate-seek-vsynth2-asv2: SRC = fate/vsynth2-asv2.avi
-fate-seek-vsynth2-dnxhd-1080i: SRC = fate/vsynth2-dnxhd-1080i.mov
-fate-seek-vsynth2-dnxhd-720p: SRC = fate/vsynth2-dnxhd-720p.dnxhd
-fate-seek-vsynth2-dnxhd-720p-rd: SRC = fate/vsynth2-dnxhd-720p.dnxhd
-fate-seek-vsynth2-dv: SRC = fate/vsynth2-dv.dv
-fate-seek-vsynth2-dv-411: SRC = fate/vsynth2-dv-411.dv
-fate-seek-vsynth2-dv-50: SRC = fate/vsynth2-dv-50.dv
-fate-seek-vsynth2-ffv1: SRC = fate/vsynth2-ffv1.avi
-fate-seek-vsynth2-flashsv: SRC = fate/vsynth2-flashsv.flv
-fate-seek-vsynth2-flv: SRC = fate/vsynth2-flv.flv
-fate-seek-vsynth2-h261: SRC = fate/vsynth2-h261.avi
-fate-seek-vsynth2-h263: SRC = fate/vsynth2-h263.avi
-fate-seek-vsynth2-h263p: SRC = fate/vsynth2-h263p.avi
-fate-seek-vsynth2-huffyuv: SRC = fate/vsynth2-huffyuv.avi
-fate-seek-vsynth2-jpegls: SRC = fate/vsynth2-jpegls.avi
-fate-seek-vsynth2-ljpeg: SRC = fate/vsynth2-ljpeg.avi
-fate-seek-vsynth2-mjpeg: SRC = fate/vsynth2-mjpeg.avi
-fate-seek-vsynth2-mpeg1: SRC = fate/vsynth2-mpeg1.mpeg1video
-fate-seek-vsynth2-mpeg1b: SRC = fate/vsynth2-mpeg1b.mpeg1video
-fate-seek-vsynth2-mpeg2-422: SRC = fate/vsynth2-mpeg2-422.mpeg2video
-fate-seek-vsynth2-mpeg2-idct-int: SRC = fate/vsynth2-mpeg2-idct-int.mpeg2video
-fate-seek-vsynth2-mpeg2-ilace: SRC = fate/vsynth2-mpeg2-ilace.mpeg2video
-fate-seek-vsynth2-mpeg2-ivlc-qprd: SRC = fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
-fate-seek-vsynth2-mpeg2-thread: SRC = fate/vsynth2-mpeg2-thread.mpeg2video
-fate-seek-vsynth2-mpeg2-thread-ivlc: SRC = fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
-fate-seek-vsynth2-mpeg4: SRC = fate/vsynth2-mpeg4.mp4
-fate-seek-vsynth2-mpeg4-adap: SRC = fate/vsynth2-mpeg4-adap.avi
-fate-seek-vsynth2-mpeg4-adv: SRC = fate/vsynth2-mpeg4-adv.avi
-fate-seek-vsynth2-mpeg4-error: SRC = fate/vsynth2-mpeg4-error.avi
-fate-seek-vsynth2-mpeg4-nr: SRC = fate/vsynth2-mpeg4-nr.avi
-fate-seek-vsynth2-mpeg4-nsse: SRC = fate/vsynth2-mpeg4-nsse.avi
-fate-seek-vsynth2-mpeg4-qpel: SRC = fate/vsynth2-mpeg4-qpel.avi
-fate-seek-vsynth2-mpeg4-qprd: SRC = fate/vsynth2-mpeg4-qprd.avi
-fate-seek-vsynth2-mpeg4-rc: SRC = fate/vsynth2-mpeg4-rc.avi
-fate-seek-vsynth2-mpeg4-thread: SRC = fate/vsynth2-mpeg4-thread.avi
-fate-seek-vsynth2-msmpeg4: SRC = fate/vsynth2-msmpeg4.avi
-fate-seek-vsynth2-msmpeg4v2: SRC = fate/vsynth2-msmpeg4v2.avi
-fate-seek-vsynth2-rgb: SRC = fate/vsynth2-rgb.avi
-fate-seek-vsynth2-roqvideo: SRC = fate/vsynth2-roqvideo.roq
-fate-seek-vsynth2-rv10: SRC = fate/vsynth2-rv10.rm
-fate-seek-vsynth2-rv20: SRC = fate/vsynth2-rv20.rm
-fate-seek-vsynth2-snow: SRC = fate/vsynth2-snow.avi
-fate-seek-vsynth2-snow-ll: SRC = fate/vsynth2-snow-ll.avi
-fate-seek-vsynth2-svq1: SRC = fate/vsynth2-svq1.mov
-fate-seek-vsynth2-wmv1: SRC = fate/vsynth2-wmv1.avi
-fate-seek-vsynth2-wmv2: SRC = fate/vsynth2-wmv2.avi
-fate-seek-vsynth2-yuv: SRC = fate/vsynth2-yuv.avi
-
-FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI)
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO, AVI) += rgb
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ROQ, ROQ) += roqvideo
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV10, RM) += rv10
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV20, RM) += rv20
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW, AVI) += snow
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW, AVI) += snow-ll
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SVQ1, MOV) += svq1
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV1, AVI) += wmv1
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV2, AVI) += wmv2
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO, AVI) += yuv
+
+fate-seek-vsynth_lena-asv1: SRC = fate/vsynth_lena-asv1.avi
+fate-seek-vsynth_lena-asv2: SRC = fate/vsynth_lena-asv2.avi
+fate-seek-vsynth_lena-dnxhd-1080i: SRC = fate/vsynth_lena-dnxhd-1080i.mov
+fate-seek-vsynth_lena-dnxhd-720p: SRC = fate/vsynth_lena-dnxhd-720p.dnxhd
+fate-seek-vsynth_lena-dnxhd-720p-rd: SRC = fate/vsynth_lena-dnxhd-720p.dnxhd
+fate-seek-vsynth_lena-dv: SRC = fate/vsynth_lena-dv.dv
+fate-seek-vsynth_lena-dv-411: SRC = fate/vsynth_lena-dv-411.dv
+fate-seek-vsynth_lena-dv-50: SRC = fate/vsynth_lena-dv-50.dv
+fate-seek-vsynth_lena-ffv1: SRC = fate/vsynth_lena-ffv1.avi
+fate-seek-vsynth_lena-flashsv: SRC = fate/vsynth_lena-flashsv.flv
+fate-seek-vsynth_lena-flv: SRC = fate/vsynth_lena-flv.flv
+fate-seek-vsynth_lena-h261: SRC = fate/vsynth_lena-h261.avi
+fate-seek-vsynth_lena-h263: SRC = fate/vsynth_lena-h263.avi
+fate-seek-vsynth_lena-h263p: SRC = fate/vsynth_lena-h263p.avi
+fate-seek-vsynth_lena-huffyuv: SRC = fate/vsynth_lena-huffyuv.avi
+fate-seek-vsynth_lena-jpegls: SRC = fate/vsynth_lena-jpegls.avi
+fate-seek-vsynth_lena-ljpeg: SRC = fate/vsynth_lena-ljpeg.avi
+fate-seek-vsynth_lena-mjpeg: SRC = fate/vsynth_lena-mjpeg.avi
+fate-seek-vsynth_lena-mpeg1: SRC = fate/vsynth_lena-mpeg1.mpeg1video
+fate-seek-vsynth_lena-mpeg1b: SRC = fate/vsynth_lena-mpeg1b.mpeg1video
+fate-seek-vsynth_lena-mpeg2-422: SRC = fate/vsynth_lena-mpeg2-422.mpeg2video
+fate-seek-vsynth_lena-mpeg2-idct-int: SRC = fate/vsynth_lena-mpeg2-idct-int.mpeg2video
+fate-seek-vsynth_lena-mpeg2-ilace: SRC = fate/vsynth_lena-mpeg2-ilace.mpeg2video
+fate-seek-vsynth_lena-mpeg2-ivlc-qprd: SRC = fate/vsynth_lena-mpeg2-ivlc-qprd.mpeg2video
+fate-seek-vsynth_lena-mpeg2-thread: SRC = fate/vsynth_lena-mpeg2-thread.mpeg2video
+fate-seek-vsynth_lena-mpeg2-thread-ivlc: SRC = fate/vsynth_lena-mpeg2-thread-ivlc.mpeg2video
+fate-seek-vsynth_lena-mpeg4: SRC = fate/vsynth_lena-mpeg4.mp4
+fate-seek-vsynth_lena-mpeg4-adap: SRC = fate/vsynth_lena-mpeg4-adap.avi
+fate-seek-vsynth_lena-mpeg4-adv: SRC = fate/vsynth_lena-mpeg4-adv.avi
+fate-seek-vsynth_lena-mpeg4-error: SRC = fate/vsynth_lena-mpeg4-error.avi
+fate-seek-vsynth_lena-mpeg4-nr: SRC = fate/vsynth_lena-mpeg4-nr.avi
+fate-seek-vsynth_lena-mpeg4-nsse: SRC = fate/vsynth_lena-mpeg4-nsse.avi
+fate-seek-vsynth_lena-mpeg4-qpel: SRC = fate/vsynth_lena-mpeg4-qpel.avi
+fate-seek-vsynth_lena-mpeg4-qprd: SRC = fate/vsynth_lena-mpeg4-qprd.avi
+fate-seek-vsynth_lena-mpeg4-rc: SRC = fate/vsynth_lena-mpeg4-rc.avi
+fate-seek-vsynth_lena-mpeg4-thread: SRC = fate/vsynth_lena-mpeg4-thread.avi
+fate-seek-vsynth_lena-msmpeg4: SRC = fate/vsynth_lena-msmpeg4.avi
+fate-seek-vsynth_lena-msmpeg4v2: SRC = fate/vsynth_lena-msmpeg4v2.avi
+fate-seek-vsynth_lena-rgb: SRC = fate/vsynth_lena-rgb.avi
+fate-seek-vsynth_lena-roqvideo: SRC = fate/vsynth_lena-roqvideo.roq
+fate-seek-vsynth_lena-rv10: SRC = fate/vsynth_lena-rv10.rm
+fate-seek-vsynth_lena-rv20: SRC = fate/vsynth_lena-rv20.rm
+fate-seek-vsynth_lena-snow: SRC = fate/vsynth_lena-snow.avi
+fate-seek-vsynth_lena-snow-ll: SRC = fate/vsynth_lena-snow-ll.avi
+fate-seek-vsynth_lena-svq1: SRC = fate/vsynth_lena-svq1.mov
+fate-seek-vsynth_lena-wmv1: SRC = fate/vsynth_lena-wmv1.avi
+fate-seek-vsynth_lena-wmv2: SRC = fate/vsynth_lena-wmv2.avi
+fate-seek-vsynth_lena-yuv: SRC = fate/vsynth_lena-yuv.avi
+
+FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%)