diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:05:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:07:00 +0200 |
| commit | 82edf6727f0663601351081ca1e4fb20d1752972 (patch) | |
| tree | 12479c3ec8cedfa0ec4dda38a72023224f2b5b73 /tests | |
| parent | f87dacb27de93f995cb18f9dcc73581ef8fc157b (diff) | |
| parent | f61ce90caa909d131ea6ec205823568a38115529 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs
lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs
Add Dolby/DPLII downmix support to libavresample
vorbisdec: replace div/mod in loop with a counter
fate: vorbis: add 5.1 surround test
rtpenc: Allow requesting H264 RTP packetization mode 0
configure: Sort the library listings in the help text alphabetically
dwt: remove variable-length arrays
RTMPT protocol support
http: Properly handle chunked transfer-encoding for replies to post data
http: Fail reading if the connection has gone away
amr: Mark an array const
amr: More space cleanup
rtpenc: Fix memory leaks in the muxer open function
Conflicts:
Changelog
configure
doc/APIchanges
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/vorbis.mak | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 802c529e4d..774cb350d1 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -76,6 +76,10 @@ FATE_VORBIS += fate-vorbis-19 fate-vorbis-19: CMD = pcm -i $(SAMPLES)/vorbis/test-short2_small.ogg fate-vorbis-19: REF = $(SAMPLES)/vorbis/test-short2_small.pcm +FATE_VORBIS += fate-vorbis-20 +fate-vorbis-20: CMD = pcm -i $(SAMPLES)/vorbis/6.ogg +fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm + FATE_SAMPLES_AVCONV += $(FATE_VORBIS) fate-vorbis: $(FATE_VORBIS) $(FATE_VORBIS): CMP = oneoff |