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)
commit7711f19eda40a7fd1c8a327f1700ffdd115e1667
treea5e84b671607fe633568f86d2f5cf8c2dea698db
parent211372e86dbf73505bd981dec7ad755e0623d22d
parente816034a5fa131b13c4ad87bb0b5065b4f5697c6
Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

* 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:
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