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-06-24 03:07:04 +02:00
2011-06-23 07:31:54 +01:00
2011-08-03 11:56:58 +03:00
2011-10-22 11:11:08 +02:00
2011-07-06 00:29:59 +01:00
2011-10-24 01:01:21 +02:00
2011-11-23 04:02:17 +01:00
2011-11-25 13:19:53 +00:00
2011-06-24 03:07:04 +02:00
2011-06-30 04:32:24 +02:00
2011-11-24 03:32:24 +01:00
2011-07-22 12:08:52 +02:00
2011-07-21 16:28:53 +02:00
2011-07-22 12:08:52 +02:00
2011-09-29 01:11:01 +02:00
2011-07-22 12:08:52 +02:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-07-06 01:34:08 +02:00
2011-11-24 03:32:24 +01:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-10-22 01:16:41 +02:00
2011-11-24 03:32:24 +01:00
2011-11-24 03:32:24 +01:00
2011-10-21 01:00:41 -07:00
2011-07-11 04:23:25 +02:00
2011-11-24 03:32:24 +01:00
2011-10-03 01:49:36 +02:00
2011-06-24 03:07:04 +02:00
2011-11-24 03:32:24 +01:00
2011-06-23 07:31:54 +01:00
2011-06-24 03:07:04 +02:00
2011-07-16 19:43:35 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 01:49:36 +02:00
2011-06-24 03:07:04 +02:00