diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 14:23:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 14:33:33 +0200 |
| commit | 104f42e69485557a7d603047e1d29c44bbd12562 (patch) | |
| tree | f70179c1693b6fe212ac4090f49ea1ed843f92d4 /tests | |
| parent | c2271fa7f9a88afb374300c7320b57b870969926 (diff) | |
| parent | 7b44061f4be1075eefbc2eec649f38dd0dbfcc82 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/APIchanges: add an entry for codec descriptors.
vorbisenc: set AVCodecContext.bit_rate to 0
vorbisenc: fix quality parameter
FATE: add ALAC encoding tests
lpc: fix alignment of windowed samples for odd maximum LPC order
alacenc: use s16p sample format as input
alacenc: remove unneeded sample_fmt check
alacenc: fix max_frame_size calculation for the final frame
adpcm_swf: Use correct sample offsets when using trellis.
rtmp: support strict rtmp servers
mjpegdec: support AVRn interlaced
x86: remove FASTDIV inline asm
Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/fate/alac.mak | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 5eef779d61..81ce3e14ee 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -38,6 +38,7 @@ include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/aac.mak include $(SRC_PATH)/tests/fate/ac3.mak include $(SRC_PATH)/tests/fate/adpcm.mak +include $(SRC_PATH)/tests/fate/alac.mak include $(SRC_PATH)/tests/fate/als.mak include $(SRC_PATH)/tests/fate/amrnb.mak include $(SRC_PATH)/tests/fate/amrwb.mak diff --git a/tests/fate/alac.mak b/tests/fate/alac.mak new file mode 100644 index 0000000000..b55b5949b6 --- /dev/null +++ b/tests/fate/alac.mak @@ -0,0 +1,15 @@ +FATE_ALAC += fate-alac-level-0 \ + fate-alac-level-1 \ + fate-alac-level-2 \ + fate-alac-lpc-orders \ + +fate-alac-level-%: OPTS = -compression_level $(@:fate-alac-level-%=%) +fate-alac-lpc-orders: OPTS = -min_prediction_order 1 -max_prediction_order 30 + +fate-alac-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-alac-%: CMD = enc_dec_pcm mov wav s16le $(REF) -c alac $(OPTS) +fate-alac-%: CMP = oneoff +fate-alac-%: FUZZ = 0 + +FATE_SAMPLES_AVCONV += $(FATE_ALAC) +fate-alac: $(FATE_ALAC) |