diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 13:45:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 13:52:03 +0100 |
| commit | cd37963684d8ee9819af15ccebe09d84839101dd (patch) | |
| tree | 33c99132f79f095301b4e453c40f0b77005f5b1d /tests/fate/acodec.mak | |
| parent | 60e957476e338a200501e0bdad40b7bf0076b268 (diff) | |
| parent | 381dc1a5ec0925b281c573457c413ae643567086 (diff) | |
| download | ffmpeg-cd37963684d8ee9819af15ccebe09d84839101dd.tar.gz | |
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
* commit '381dc1a5ec0925b281c573457c413ae643567086':
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
fate: Add shorthands for acodec PCM and ADPCM tests
avconv: Drop unused function argument from do_video_stats()
cmdutils: Conditionally compile libswscale-related bits
aacenc: Drop some unused function arguments
rtsp: Avoid a cast when calling strtol
nut: support textual data
nutenc: verbosely report unsupported negative pts
Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/acodec.mak')
| -rw-r--r-- | tests/fate/acodec.mak | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index af4f469e04..f1c9f37045 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -18,7 +18,9 @@ FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32LE, WAV) += f32le FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64BE, AU) += f64be FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64LE, WAV) += f64le -FATE_ACODEC += $(FATE_ACODEC_PCM-yes:%=fate-acodec-pcm-%) +FATE_ACODEC_PCM := $(FATE_ACODEC_PCM-yes:%=fate-acodec-pcm-%) +FATE_ACODEC += $(FATE_ACODEC_PCM) +fate-acodec-pcm: $(FATE_ACODEC_PCM) fate-acodec-pcm-%: FMT = wav fate-acodec-pcm-%: CODEC = pcm_$(@:fate-acodec-pcm-%=%) @@ -34,7 +36,9 @@ FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_MS, WAV) += ms FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, FLV) += swf FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha -FATE_ACODEC += $(FATE_ACODEC_ADPCM-yes:%=fate-acodec-adpcm-%) +FATE_ACODEC_ADPCM := $(FATE_ACODEC_ADPCM-yes:%=fate-acodec-adpcm-%) +FATE_ACODEC += $(FATE_ACODEC_ADPCM) +fate-acodec-adpcm: $(FATE_ACODEC_ADPCM) fate-acodec-adpcm-%: CODEC = adpcm_$(@:fate-acodec-adpcm-%=%) |