diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:51:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:51:20 +0100 |
| commit | 7d26be63c25e715f008e8923654bdf318419dd39 (patch) | |
| tree | c3d598d06854085a7e9f9474dee81e543f069cdb /tests | |
| parent | e859339e7af52210c6fe84a8e6412f0c30d1c4da (diff) | |
| parent | 5ff998a233d759d0de83ea6f95c383d03d25d88e (diff) | |
| download | ffmpeg-7d26be63c25e715f008e8923654bdf318419dd39.tar.gz | |
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
flacenc: use uint64_t for bit counts
flacenc: remove wasted trailing 0 bits
lavu: add av_ctz() for trailing zero bit count
flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
fate: aac: Place LATM tests and general AAC tests in different groups
build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/aac.mak | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 1ac17f1110..b87ef761f9 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -46,7 +46,7 @@ FATE_AAC += fate-aac-al_sbr_ps_06_ur fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16 -FATE_AAC += fate-aac-latm_000000001180bc60 +FATE_AAC_LATM += fate-aac-latm_000000001180bc60 fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 @@ -54,7 +54,7 @@ FATE_AAC += fate-aac-ap05_48 fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16 -FATE_AAC += fate-aac-latm_stereo_to_51 +FATE_AAC_LATM += fate-aac-latm_stereo_to_51 fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 @@ -88,8 +88,12 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 -FATE_SAMPLES_FFMPEG += $(FATE_AAC) $(FATE_AAC_ENCODE) -fate-aac: $(FATE_AAC) $(FATE_AAC_ENCODE) +FATE_AAC_ALL = $(FATE_AAC) $(FATE_AAC_LATM) -$(FATE_AAC): CMP = oneoff -$(FATE_AAC): FUZZ = 2 +$(FATE_AAC_ALL): CMP = oneoff +$(FATE_AAC_ALL): FUZZ = 2 + +FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) + +fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) +fate-aac-latm: $(FATE_AAC_LATM) |