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
..
2011-11-26 01:12:08 +01:00
2010-08-04 18:47:20 +00:00
2011-06-29 19:22:58 +01:00
2011-06-29 19:22:58 +01:00
2011-07-04 10:38:17 +01:00
2011-07-04 18:33:04 +01:00
2011-09-05 22:29:16 +02:00
2011-08-26 20:54:36 +02:00
2011-09-04 13:12:00 +02:00
2011-10-14 22:24:00 +02:00
2010-08-04 18:47:20 +00:00
2011-11-23 20:19:26 +01:00