Michael Niedermayer
022f8d27dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
Janne Grunau
d14d4d982c
aacdec: add more fate tests covering SBR and PS
...
Add all seven test bitstreams of Coding Technologies "aacPlus Decoder
Check Package". The streams cover different ways to signal SBR and PS
in different formats.
2011-11-25 08:25:12 +01:00
Alex Converse
29651e1d44
fate-aac: Expand coverage.
...
Add al05_44, al06_44, al17_44.
2011-07-01 10:14:14 -07:00
Justin Ruggles
08e434b015
Add an aac sample which uses LTP to fate-aac.
2011-05-14 12:41:11 -04:00
Janne Grunau
0ba832231d
fate: add AAC LATM test
2011-04-06 20:55:58 +02:00
Måns Rullgård
4c3fbd4f93
fate: move some groups of related tests to their own files
...
This moves some groups of tests for single codecs to separate files,
and adds shorthands for running all tests in a group.
Originally committed as revision 24697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 18:47:20 +00:00