Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:17:29 +0000 (04:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:25:37 +0000 (04:25 +0200)
commit1f5e5d2205df568f86371660b0991ec7087e94e6
treede4e14688195143baab7988797d3329904a92ee4
parente755c8ac462e85e6c3de4f0207dc6bb5c86409cf
parentba13606ca6adbc74b4db4a72b0769397d6408791
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
  fate: Add a --target-samples path parameter

Conflicts:
configure
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
31 files changed:
configure
tests/fate.sh
tests/fate/aac.mak
tests/fate/ac3.mak
tests/fate/adpcm.mak
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-audio.mak
tests/fate/filter-video.mak
tests/fate/flac.mak
tests/fate/gif.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/mp3.mak
tests/fate/pcm.mak
tests/fate/probe.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/subtitles.mak
tests/fate/utvideo.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak