Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 01:21:08 +0000 (02:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 01:33:27 +0000 (02:33 +0100)
* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
  fate-seek: remove use of gnu make 3.82 only private modifier
  fate: move vsynth reference files to their own directory
  fate: move fate-acodec reference files to their own dir
  configure: avplay now depends on avresample
  fate: split dependencies for fate-seek tests

Conflicts:
configure
tests/fate/seek.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
211 files changed:
1  2 
tests/fate-run.sh
tests/fate/acodec.mak
tests/fate/seek.mak
tests/fate/vcodec.mak
tests/ref/acodec/adpcm_ima_qt
tests/ref/acodec/alac
tests/ref/acodec/flac
tests/ref/acodec/g723_1
tests/ref/acodec/pcm-f32be
tests/ref/acodec/pcm-f64be
tests/ref/acodec/pcm-s16be
tests/ref/acodec/pcm-s16be_planar
tests/ref/acodec/pcm-s16le_planar
tests/ref/acodec/pcm-s24be
tests/ref/acodec/pcm-s24le_planar
tests/ref/acodec/pcm-s32be
tests/ref/acodec/pcm-s32le_planar
tests/ref/acodec/pcm-s8
tests/ref/acodec/pcm-s8_planar
tests/ref/acodec/pcm-u16be
tests/ref/acodec/pcm-u16le
tests/ref/acodec/pcm-u24be
tests/ref/acodec/pcm-u24le
tests/ref/acodec/pcm-u32be
tests/ref/acodec/pcm-u32le
tests/ref/acodec/roqaudio
tests/ref/seek/acodec-flac
tests/ref/seek/acodec-pcm-f32be
tests/ref/seek/acodec-pcm-f64be
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-au
tests/ref/seek/lavf-avi
tests/ref/seek/lavf-dv_fmt
tests/ref/seek/lavf-ffm
tests/ref/seek/lavf-flv_fmt
tests/ref/seek/lavf-gif
tests/ref/seek/lavf-gxf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mmf
tests/ref/seek/lavf-mov
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-mxf_d10
tests/ref/seek/lavf-nut
tests/ref/seek/lavf-ogg
tests/ref/seek/lavf-rm
tests/ref/seek/lavf-ts
tests/ref/seek/lavf-voc
tests/ref/seek/lavf-wav
tests/ref/seek/vsynth2-dnxhd-1080i
tests/ref/seek/vsynth2-dnxhd-720p
tests/ref/seek/vsynth2-dnxhd-720p-rd
tests/ref/seek/vsynth2-dv
tests/ref/seek/vsynth2-dv-411
tests/ref/seek/vsynth2-dv-50
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-amv
tests/ref/vsynth/vsynth1-avui
tests/ref/vsynth/vsynth1-cljr
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-dnxhd-720p
tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
tests/ref/vsynth/vsynth1-dnxhd-720p-rd
tests/ref/vsynth/vsynth1-dnxhd_1080i
tests/ref/vsynth/vsynth1-dv
tests/ref/vsynth/vsynth1-dv-411
tests/ref/vsynth/vsynth1-dv-50
tests/ref/vsynth/vsynth1-dv_411
tests/ref/vsynth/vsynth1-ffvhuff
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flashsv2
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth1-h263
tests/ref/vsynth/vsynth1-h263-obmc
tests/ref/vsynth/vsynth1-h263p
tests/ref/vsynth/vsynth1-huffyuv
tests/ref/vsynth/vsynth1-j2k
tests/ref/vsynth/vsynth1-jpegls
tests/ref/vsynth/vsynth1-mjpeg
tests/ref/vsynth/vsynth1-mjpeg-422
tests/ref/vsynth/vsynth1-mjpeg-444
tests/ref/vsynth/vsynth1-mpeg1
tests/ref/vsynth/vsynth1-mpeg1b
tests/ref/vsynth/vsynth1-mpeg2
tests/ref/vsynth/vsynth1-mpeg2-422
tests/ref/vsynth/vsynth1-mpeg2-ilace
tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth1-mpeg2-thread
tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth1-mpeg4-adap
tests/ref/vsynth/vsynth1-mpeg4-adv
tests/ref/vsynth/vsynth1-mpeg4-error
tests/ref/vsynth/vsynth1-mpeg4-nr
tests/ref/vsynth/vsynth1-mpeg4-qpel
tests/ref/vsynth/vsynth1-mpeg4-qprd
tests/ref/vsynth/vsynth1-mpeg4-rc
tests/ref/vsynth/vsynth1-mpeg4-thread
tests/ref/vsynth/vsynth1-mpng
tests/ref/vsynth/vsynth1-msmpeg4
tests/ref/vsynth/vsynth1-msmpeg4v2
tests/ref/vsynth/vsynth1-msvideo1
tests/ref/vsynth/vsynth1-prores
tests/ref/vsynth/vsynth1-prores_kostya
tests/ref/vsynth/vsynth1-qtrle
tests/ref/vsynth/vsynth1-qtrlegray
tests/ref/vsynth/vsynth1-r210
tests/ref/vsynth/vsynth1-rgb
tests/ref/vsynth/vsynth1-rv10
tests/ref/vsynth/vsynth1-rv20
tests/ref/vsynth/vsynth1-svq1
tests/ref/vsynth/vsynth1-v308
tests/ref/vsynth/vsynth1-v408
tests/ref/vsynth/vsynth1-wmv1
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth1-y41p
tests/ref/vsynth/vsynth1-yuv
tests/ref/vsynth/vsynth1-yuv4
tests/ref/vsynth/vsynth1-zlib
tests/ref/vsynth/vsynth1-zmbv
tests/ref/vsynth/vsynth2-amv
tests/ref/vsynth/vsynth2-avui
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dnxhd_1080i
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-dv_411
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flashsv2
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-j2k
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mjpeg-422
tests/ref/vsynth/vsynth2-mjpeg-444
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-mpng
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-msvideo1
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-prores_kostya
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-qtrlegray
tests/ref/vsynth/vsynth2-r210
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v308
tests/ref/vsynth/vsynth2-v408
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-y41p
tests/ref/vsynth/vsynth2-yuv
tests/ref/vsynth/vsynth2-yuv4
tests/ref/vsynth/vsynth2-zlib
tests/ref/vsynth/vsynth2-zmbv

Simple merge
@@@ -1,7 -1,8 +1,8 @@@
  fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
  fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
 -fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
 +fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep
  fate-acodec-%: CMP_UNIT = 2
+ fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%)
  
  FATE_ACODEC_PCM-$(call ENCDEC, PCM_ALAW,  WAV) += alaw
  FATE_ACODEC_PCM-$(call ENCDEC, PCM_MULAW, WAV) += mulaw
@@@ -25,96 -50,182 +50,186 @@@ FATE_SEEK += $(FATE_SEEK_ACODEC-yes:%=f
  
  # files from fate-vsynth2
  
- FATE_SEEK-$(call ENCDEC, ASV1,          AVI)     += asv1_avi
- FATE_SEEK-$(call ENCDEC, ASV2,          AVI)     += asv2_avi
- FATE_SEEK-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd_720p_dnxhd
- FATE_SEEK-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd_720p_rd_dnxhd
- FATE_SEEK-$(call ENCDEC, DNXHD,         MOV)     += dnxhd_1080i_mov
- FATE_SEEK-$(call ENCDEC, DVVIDEO,       DV)      += dv_dv
- FATE_SEEK-$(call ENCDEC, DVVIDEO,       DV)      += dv_411_dv
- FATE_SEEK-$(call ENCDEC, DVVIDEO,       DV)      += dv_50_dv
- FATE_SEEK-$(call ENCDEC, FFV1,          AVI)     += ffv1_avi
- FATE_SEEK-$(call ENCDEC, FLASHSV,       FLV)     += flashsv_flv
- FATE_SEEK-$(call ENCDEC, FLV,           FLV)     += flv_flv
- FATE_SEEK-$(call ENCDEC, H261,          AVI)     += h261_avi
- FATE_SEEK-$(call ENCDEC, H263,          AVI)     += h263_avi
- FATE_SEEK-$(call ENCDEC, H263,          AVI)     += h263p_avi
- FATE_SEEK-$(call ENCDEC, HUFFYUV,       AVI)     += huffyuv_avi
- FATE_SEEK-$(call ENCDEC, JPEGLS,        AVI)     += jpegls_avi
- FATE_SEEK-$(call ENCDEC, LJPEG MJPEG,   AVI)     += ljpeg_avi
- FATE_SEEK-$(call ENCDEC, MJPEG,         AVI)     += mjpeg_avi
- FATE_SEEK-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=           \
-                                                     mpeg1_mpeg1video    \
-                                                     mpeg1b_mpeg1video
- FATE_SEEK-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=                  \
-                                                     mpeg2_422_mpeg2video       \
-                                                     mpeg2_idct_int_mpeg2video  \
-                                                     mpeg2_ilace_mpeg2video     \
-                                                     mpeg2_ivlc_qprd_mpeg2video \
-                                                     mpeg2_thread_mpeg2video    \
-                                                     mpeg2_thread_ivlc_mpeg2video
- FATE_SEEK-$(call ENCDEC, MPEG4,         MP4 MOV) += mpeg4_mp4
- FATE_SEEK-$(call ENCDEC, MPEG4, AVI) += $(subst -,_,$(FATE_MPEG4_AVI:%=%_avi))
- FATE_SEEK-$(call ENCDEC, MSMPEG4V3,     AVI)     += msmpeg4_avi
- FATE_SEEK-$(call ENCDEC, MSMPEG4V2,     AVI)     += msmpeg4v2_avi
- FATE_SEEK-$(call ENCDEC, RAWVIDEO,      AVI)     += rgb_avi
- FATE_SEEK-$(call ENCDEC, ROQ,           ROQ)     += roqvideo_roq
- FATE_SEEK-$(call ENCDEC, RV10,          RM)      += rv10_rm
- FATE_SEEK-$(call ENCDEC, RV20,          RM)      += rv20_rm
- FATE_SEEK-$(call ENCDEC, SNOW,          AVI)     += snow_avi
- FATE_SEEK-$(call ENCDEC, SNOW,          AVI)     += snow_ll_avi
- FATE_SEEK-$(call ENCDEC, SVQ1,          MOV)     += svq1_mov
- FATE_SEEK-$(call ENCDEC, WMV1,          AVI)     += wmv1_avi
- FATE_SEEK-$(call ENCDEC, WMV2,          AVI)     += wmv2_avi
- FATE_SEEK-$(call ENCDEC, RAWVIDEO,      AVI)     += yuv_avi
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, ASV1,          AVI)     += asv1
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, ASV2,          AVI)     += asv2
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p-rd
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         MOV)     += dnxhd-1080i
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv-411
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv-50
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, FFV1,          AVI)     += ffv1
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, FLASHSV,       FLV)     += flashsv
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, FLV,           FLV)     += flv
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, H261,          AVI)     += h261
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, H263,          AVI)     += h263
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, H263,          AVI)     += h263p
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, HUFFYUV,       AVI)     += huffyuv
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, JPEGLS,        AVI)     += jpegls
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, LJPEG MJPEG,   AVI)     += ljpeg
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, MJPEG,         AVI)     += mjpeg
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=          \
+                                                     mpeg1                      \
+                                                     mpeg1b
+ FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=          \
+                                                     mpeg2-422                  \
+                                                     mpeg2-idct-int             \
+                                                     mpeg2-ilace                \
+                                                     mpeg2-ivlc-qprd            \
+                                                     mpeg2-thread               \
+                                                     mpeg2-thread-ivlc
+ 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-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_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
  
  # files from fate-lavf
  
- FATE_SEEK-$(call ENCDEC,  PCM_S16BE,             AIFF)        += lavf_aif
- FATE_SEEK-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)    += lavf_al
- FATE_SEEK-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)         += lavf_asf
- FATE_SEEK-$(call ENCDEC,  PCM_S16BE,             AU)          += lavf_au
- FATE_SEEK-$(call ENCDEC2, MPEG4,      MP2,       AVI)         += lavf_avi
- FATE_SEEK-$(call ENCDEC,  BMP,                   IMAGE2)      += image_bmp
- FATE_SEEK-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)         += lavf_dv
- FATE_SEEK-$(call ENCDEC2, MPEG1VIDEO, MP2,       FFM)         += lavf_ffm
- FATE_SEEK-$(call ENCDEC,  FLV,                   FLV)         += lavf_flv
- FATE_SEEK-$(call ENCDEC,  GIF,                   IMAGE2)      += lavf_gif
- FATE_SEEK-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)         += lavf_gxf
- FATE_SEEK-$(call ENCDEC,  MJPEG,                 IMAGE2)      += image_jpg
- FATE_SEEK-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)    += lavf_mkv
- FATE_SEEK-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)         += lavf_mmf
- FATE_SEEK-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)         += lavf_mov
- FATE_SEEK-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += lavf_mpg
- FATE_SEEK-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += lavf_ul
- FATE_SEEK-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)         += lavf_mxf
- FATE_SEEK-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += lavf_mxf_d10
- FATE_SEEK-$(call ENCDEC2, MPEG4,      MP2,       NUT)         += lavf_nut
- FATE_SEEK-$(call ENCDEC,  FLAC,                  OGG)         += lavf_ogg
- FATE_SEEK-$(call ENCDEC,  PBM,                   IMAGE2PIPE)  += pbmpipe_pbm
- FATE_SEEK-$(call ENCDEC,  PCX,                   IMAGE2)      += image_pcx
- FATE_SEEK-$(call ENCDEC,  PGM,                   IMAGE2)      += image_pgm
- FATE_SEEK-$(call ENCDEC,  PGM,                   IMAGE2PIPE)  += pgmpipe_pgm
- FATE_SEEK-$(call ENCDEC,  PPM,                   IMAGE2)      += image_ppm
- FATE_SEEK-$(call ENCDEC,  PPM,                   IMAGE2PIPE)  += ppmpipe_ppm
- FATE_SEEK-$(call ENCMUX,  RV10 AC3_FIXED,        RM)          += lavf_rm
- FATE_SEEK-$(call ENCDEC,  SGI,                   IMAGE2)      += image_sgi
- FATE_SEEK-$(call ENCDEC,  FLV,                   SWF)         += lavf_swf
- FATE_SEEK-$(call ENCDEC,  TARGA,                 IMAGE2)      += image_tga
- FATE_SEEK-$(call ENCDEC,  TIFF,                  IMAGE2)      += image_tiff
- FATE_SEEK-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)      += lavf_ts
- FATE_SEEK-$(call ENCDEC,  PCM_U8,                VOC)         += lavf_voc
- FATE_SEEK-$(call ENCDEC,  PCM_S16LE,             WAV)         += lavf_wav
- FATE_SEEK-$(call ENCDEC,  MP2,                   WTV)         += lavf_wtv
- FATE_SEEK-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += lavf_y4m
- FATE_SEEK += $(FATE_SEEK-yes:%=fate-seek-%)
- $(FATE_SEEK): fate-acodec fate-vsynth2 fate-lavf libavformat/seek-test$(EXESUF)
- $(FATE_SEEK): CMD = seektest
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)        += aiff
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)    += alaw
+ FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)         += asf
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)          += au
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)         += avi
+ FATE_SEEK_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)      += bmp
+ FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)         += dv_fmt
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       FFM)         += ffm
+ FATE_SEEK_LAVF-$(call ENCDEC,  FLV,                   FLV)         += flv_fmt
+ FATE_SEEK_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)      += gif
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)         += gxf
+ FATE_SEEK_LAVF-$(call ENCDEC,  MJPEG,                 IMAGE2)      += jpg
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)    += mkv
+ FATE_SEEK_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)         += mmf
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)         += mov
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += mulaw
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)         += mxf
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)         += nut
+ FATE_SEEK_LAVF-$(call ENCDEC,  FLAC,                  OGG)         += ogg
+ FATE_SEEK_LAVF-$(call ENCDEC,  PBM,                   IMAGE2PIPE)  += pbmpipe
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCX,                   IMAGE2)      += pcx
+ FATE_SEEK_LAVF-$(call ENCDEC,  PGM,                   IMAGE2)      += pgm
+ FATE_SEEK_LAVF-$(call ENCDEC,  PGM,                   IMAGE2PIPE)  += pgmpipe
+ FATE_SEEK_LAVF-$(call ENCDEC,  PPM,                   IMAGE2)      += ppm
+ FATE_SEEK_LAVF-$(call ENCDEC,  PPM,                   IMAGE2PIPE)  += ppmpipe
+ FATE_SEEK_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)          += rm
+ FATE_SEEK_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)      += sgi
+ FATE_SEEK_LAVF-$(call ENCDEC,  FLV,                   SWF)         += swf
+ FATE_SEEK_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)      += tga
+ FATE_SEEK_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)      += tiff
+ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)      += ts
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_U8,                VOC)         += voc
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)         += wav
++FATE_SEEK-LAVF-$(call ENCDEC,  MP2,                   WTV)         += wtv
+ FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += yuv4mpeg
+ fate-seek-lavf-aiff:     SRC = lavf/lavf.aif
+ fate-seek-lavf-alaw:     SRC = lavf/lavf.al
+ fate-seek-lavf-asf:      SRC = lavf/lavf.asf
+ fate-seek-lavf-au:       SRC = lavf/lavf.au
+ fate-seek-lavf-avi:      SRC = lavf/lavf.avi
+ fate-seek-lavf-bmp:      SRC = images/bmp/%02d.bmp
+ fate-seek-lavf-dv_fmt:   SRC = lavf/lavf.dv
+ fate-seek-lavf-ffm:      SRC = lavf/lavf.ffm
+ fate-seek-lavf-flv_fmt:  SRC = lavf/lavf.flv
+ fate-seek-lavf-gif:      SRC = lavf/lavf.gif
+ fate-seek-lavf-gxf:      SRC = lavf/lavf.gxf
+ fate-seek-lavf-jpg:      SRC = images/jpg/%02d.jpg
+ fate-seek-lavf-mkv:      SRC = lavf/lavf.mkv
+ fate-seek-lavf-mmf:      SRC = lavf/lavf.mmf
+ fate-seek-lavf-mov:      SRC = lavf/lavf.mov
+ fate-seek-lavf-mpg:      SRC = lavf/lavf.mpg
+ fate-seek-lavf-mulaw:    SRC = lavf/lavf.ul
+ fate-seek-lavf-mxf:      SRC = lavf/lavf.mxf
+ fate-seek-lavf-mxf_d10:  SRC = lavf/lavf.mxf_d10
+ fate-seek-lavf-nut:      SRC = lavf/lavf.nut
+ fate-seek-lavf-ogg:      SRC = lavf/lavf.ogg
+ fate-seek-lavf-pbmpipe:  SRC = lavf/pbmpipe.pbm
+ fate-seek-lavf-pcx:      SRC = images/pcx/%02d.pcx
+ fate-seek-lavf-pgm:      SRC = images/pgm/%02d.pgm
+ fate-seek-lavf-pgmpipe:  SRC = lavf/pgmpipe.pgm
+ fate-seek-lavf-ppm:      SRC = images/ppm/%02d.ppm
+ fate-seek-lavf-ppmpipe:  SRC = lavf/ppmpipe.ppm
+ fate-seek-lavf-rm:       SRC = lavf/lavf.rm
+ fate-seek-lavf-sgi:      SRC = images/sgi/%02d.sgi
+ fate-seek-lavf-swf:      SRC = lavf/lavf.swf
+ fate-seek-lavf-tga:      SRC = images/tga/%02d.tga
+ fate-seek-lavf-tiff:     SRC = images/tiff/%02d.tiff
+ fate-seek-lavf-ts:       SRC = lavf/lavf.ts
+ fate-seek-lavf-voc:      SRC = lavf/lavf.voc
+ fate-seek-lavf-wav:      SRC = lavf/lavf.wav
++fate-seek-lavf-wtv:      SRC = lavf/lavf.wtv
+ fate-seek-lavf-yuv4mpeg: SRC = lavf/lavf.y4m
+ FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)
+ $(FATE_SEEK): libavformat/seek-test$(EXESUF)
+ $(FATE_SEEK): CMD = run libavformat/seek-test$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)
+ $(FATE_SEEK): fate-seek-%: fate-%
+ fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%)
  
  FATE_AVCONV += $(FATE_SEEK)
  fate-seek:     $(FATE_SEEK)
@@@ -2,11 -2,10 +2,12 @@@ fate-vsynth1-%: SRC = tests/data/vsynth
  fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
  fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
  fate-vsynth%: FMT = avi
 -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
 +fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"
  fate-vsynth%: CMP_UNIT = 1
+ fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
  
 +FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv
 +
  FATE_VCODEC-$(call ENCDEC, ASV1, AVI)   += asv1
  fate-vsynth%-asv1:               ENCOPTS = -qscale 10
  
index a50c30a,0000000..a50c30a
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index 9f88a76,0000000..9f88a76
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 8116480,0000000..8116480
mode 100644,000000..100644
--- /dev/null
index c933001,0000000..c933001
mode 100644,000000..100644
--- /dev/null
Simple merge
index 14d4cec,0000000..14d4cec
mode 100644,000000..100644
--- /dev/null
Simple merge
index 7648766,0000000..7648766
mode 100644,000000..100644
--- /dev/null
Simple merge
index 6ab6ee0,0000000..6ab6ee0
mode 100644,000000..100644
--- /dev/null
index 0214975,0000000..0214975
mode 100644,000000..100644
--- /dev/null
index e45fe08,0000000..e45fe08
mode 100644,000000..100644
--- /dev/null
index ddab6e8,0000000..ddab6e8
mode 100644,000000..100644
--- /dev/null
index df06ca4,0000000..df06ca4
mode 100644,000000..100644
--- /dev/null
index 6a53919,0000000..6a53919
mode 100644,000000..100644
--- /dev/null
index 18a5d15,0000000..18a5d15
mode 100644,000000..100644
--- /dev/null
index ec28668,0000000..ec28668
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index f7c7f57,0000000..f7c7f57
mode 100644,000000..100644
--- /dev/null
index 03f2b31,0000000..03f2b31
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index f8f6df0,0000000..f8f6df0
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index c45b593,0000000..c45b593
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index a01ccbe,0000000..a01ccbe
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1e2f3f2,0000000..1e2f3f2
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index e631a2b,0000000..e631a2b
mode 100644,000000..100644
--- /dev/null
index 3ad0c51,0000000..3ad0c51
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 5ca268b,0000000..5ca268b
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index 0ab8860,0000000..0ab8860
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index 425c11f,0000000..425c11f
mode 100644,000000..100644
--- /dev/null
index 15b56a2,0000000..15b56a2
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index 7dc5de9,0000000..7dc5de9
mode 100644,000000..100644
--- /dev/null
index f1523d1,0000000..f1523d1
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index 93fa938,0000000..93fa938
mode 100644,000000..100644
--- /dev/null
Simple merge
index 5c473a2,0000000..5c473a2
mode 100644,000000..100644
--- /dev/null
index f5441e1,0000000..f5441e1
mode 100644,000000..100644
--- /dev/null
index c608c4b,0000000..c608c4b
mode 100644,000000..100644
--- /dev/null
index 6937df3,0000000..6937df3
mode 100644,000000..100644
--- /dev/null
index 59bac8d,0000000..59bac8d
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 81ecc5e,0000000..81ecc5e
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 708ac88,0000000..708ac88
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index d207a8b,0000000..d207a8b
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4f038fe,0000000..4f038fe
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index fc0a4ba,0000000..fc0a4ba
mode 100644,000000..100644
--- /dev/null
index e04c31c,0000000..e04c31c
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2e6865c,0000000..2e6865c
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index a915c13,0000000..a915c13
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index 4568391,0000000..4568391
mode 100644,000000..100644
--- /dev/null
index a91c12a,0000000..a91c12a
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index f7c46fc,0000000..f7c46fc
mode 100644,000000..100644
--- /dev/null
index 4c63dec,0000000..4c63dec
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index ac9d64a,0000000..ac9d64a
mode 100644,000000..100644
--- /dev/null
Simple merge
index 8fa347a,0000000..8fa347a
mode 100644,000000..100644
--- /dev/null
index 0a7ed3c,0000000..0a7ed3c
mode 100644,000000..100644
--- /dev/null
index 93e0b6a,0000000..93e0b6a
mode 100644,000000..100644
--- /dev/null