Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 18:47:13 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 18:55:38 +0000 (20:55 +0200)
* commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f':
  fate: Update ac3 test to the new request_channel_layout option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/ac3.mak

@@@ -23,17 -25,9 +25,17 @@@ fate-ac3-5.1-downmix-mono: CMD = pcm -r
  fate-ac3-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono_v2.pcm
  
  FATE_AC3 += fate-ac3-5.1-downmix-stereo
- fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
+ fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channel_layout 3 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
  fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo_v2.pcm
  
 +FATE_AC3 += fate-ac3-fixed-2.0
 +fate-ac3-fixed-2.0: CMD = pcm -c ac3_fixed -i $(TARGET_SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3
 +fate-ac3-fixed-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small_v2.pcm
 +
 +FATE_AC3 += fate-ac3-fixed-4.0-downmix-mono
 +fate-ac3-fixed-4.0-downmix-mono: CMD = pcm -c ac3_fixed -request_channels 1 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3
 +fate-ac3-fixed-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono_v2.pcm
 +
  FATE_EAC3 += fate-eac3-1
  fate-eac3-1: CMD = pcm -i $(TARGET_SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3
  fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small_v2.pcm