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
2011-11-24 04:57:38 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-23 04:02:17 +01:00
2011-07-07 22:47:24 +02:00
2011-11-06 03:01:01 +01:00
2011-11-24 00:33:20 +01:00
2011-10-10 03:50:58 +02:00
2011-03-19 13:35:52 +00:00
2011-11-24 03:32:24 +01:00
2011-09-22 17:39:30 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-11-19 02:00:06 +01:00
2011-08-13 02:56:08 +02:00
2003-04-11 13:43:17 +00:00
2011-11-07 15:13:16 +01:00
2011-01-18 20:48:24 +00:00
2011-10-10 03:50:58 +02:00
2011-05-12 04:51:24 +02:00
2011-04-29 18:08:46 +02:00
2011-03-19 13:33:20 +00:00