ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | Sat Apr 23 20:03:18 2022 +0200| [886c65784d6431761c4f801d0e250a0ef1535e93] | committer: Andreas Rheinhardt fate/acodec: Remove acodec-adpcm-adx-trellis test adx ignores the trellis option, making this test identical to acodec-adpcm-adx. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=886c65784d6431761c...

tests/fate/acodec.mak | 3 +-- tests/ref/acodec/adpcm-adx-trellis | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index efaeaf2c6e..848d57ef9c 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -84,7 +84,7 @@ fate-acodec-adpcm-swf-wav: CODEC = adpcm_swf fate-acodec-adpcm-ima_alp: FMT = alp fate-acodec-adpcm-ima_alp: ENCOPTS = -type pcm -FATE_ACODEC_ADPCM_TRELLIS := adx ima_qt ima_wav ms swf yamaha +FATE_ACODEC_ADPCM_TRELLIS := ima_qt ima_wav ms swf yamaha FATE_ACODEC_ADPCM_TRELLIS := $(FATE_ACODEC_ADPCM_TRELLIS:%=fate-acodec-adpcm-%-trellis) FATE_ACODEC_ADPCM_TRELLIS := $(filter $(addsuffix -trellis,$(FATE_ACODEC_ADPCM)), $(FATE_ACODEC_ADPCM_TRELLIS)) @@ -94,7 +94,6 @@ fate-acodec-adpcm-trellis: $(FATE_ACODEC_ADPCM_TRELLIS) fate-acodec-adpcm-%-trellis: CODEC = adpcm_$(@:fate-acodec-adpcm-%-trellis=%) fate-acodec-adpcm-%-trellis: ENCOPTS = -trellis 5 -fate-acodec-adpcm-adx-trellis: FMT = adx fate-acodec-adpcm-ima_qt-trellis: FMT = aiff fate-acodec-adpcm-ima_wav-trellis: FMT = wav fate-acodec-adpcm-ms-trellis: FMT = wav diff --git a/tests/ref/acodec/adpcm-adx-trellis b/tests/ref/acodec/adpcm-adx-trellis deleted file mode 100644 index f6f5d768f5..0000000000 --- a/tests/ref/acodec/adpcm-adx-trellis +++ /dev/null @@ -1,4 +0,0 @@ -c257001314241b469a6512616fd56548 *tests/data/fate/acodec-adpcm-adx-trellis.adx -297738 tests/data/fate/acodec-adpcm-adx-trellis.adx -5b5a436ec9d528d6eb0bebaf667521b0 *tests/data/fate/acodec-adpcm-adx-trellis.out.wav -stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes: 1058400/ 1058432