diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-25 22:01:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-25 23:17:41 +0200 |
| commit | 3ead79eaa3f77451bc93cb842ed7b38c94858045 (patch) | |
| tree | 4c90cceb47c62f96eaa518cd9ad109b539e9f1ad /tests/fate | |
| parent | cab15f9db4ba6e390b25dd80d7305bb51b5583c4 (diff) | |
| parent | 394dbde5484507f213768019623d016196ddad5f (diff) | |
| download | ffmpeg-3ead79eaa3f77451bc93cb842ed7b38c94858045.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: use updated reference for aac-latm_stereo_to_51
avconv: use libavresample
Add libavresample
FATE: avoid channel mixing in lavf-dv_fmt
Conflicts:
Changelog
Makefile
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
tests/lavf-regression.sh
tests/ref/lavf/dv_fmt
tests/ref/seek/lavf_dv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/aac.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 2a0db6a224..9236e95de5 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -55,8 +55,8 @@ 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_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -ac 6 -fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51.s16 +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 fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%) fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav |