diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
| commit | 841a288cb32785400261cbab959fcfb982d3f699 (patch) | |
| tree | 5cdac1ec2a527409495aadfb6d9142b89b398d8b /tests/fate/seek.mak | |
| parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
| parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
| download | ffmpeg-841a288cb32785400261cbab959fcfb982d3f699.tar.gz | |
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
fate: cosmetics: Order some test entries
Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/seek.mak')
| -rw-r--r-- | tests/fate/seek.mak | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index fa1f790d4c..fe8d3ab910 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -1,5 +1,13 @@ # files from fate-acodec +FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += adpcm-ima_qt +FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += adpcm-ima_wav +FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS, WAV) += adpcm-ms +FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF, FLV) += adpcm-swf +FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA, WAV) += adpcm-yamaha +FATE_SEEK_ACODEC-$(call ENCDEC, ALAC, MOV) += alac +FATE_SEEK_ACODEC-$(call ENCDEC, FLAC, FLAC) += flac +FATE_SEEK_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += mp2 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_ALAW, WAV) += pcm-alaw FATE_SEEK_ACODEC-$(call ENCDEC, PCM_MULAW, WAV) += pcm-mulaw FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S8, MOV) += pcm-s8 @@ -14,14 +22,6 @@ FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32BE, AU) += pcm-f32be FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32LE, WAV) += pcm-f32le FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64BE, AU) += pcm-f64be FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64LE, WAV) += pcm-f64le -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += adpcm-ima_qt -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += adpcm-ima_wav -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS, WAV) += adpcm-ms -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF, FLV) += adpcm-swf -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA, WAV) += adpcm-yamaha -FATE_SEEK_ACODEC-$(call ENCDEC, ALAC, MOV) += alac -FATE_SEEK_ACODEC-$(call ENCDEC, FLAC, FLAC) += flac -FATE_SEEK_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += mp2 fate-seek-acodec-adpcm-ima_qt: SRC = fate/acodec-adpcm-ima_qt.aiff fate-seek-acodec-adpcm-ima_wav: SRC = fate/acodec-adpcm-ima_wav.wav |