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-10-11 20:25:55 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-20 15:03:32 +01:00
2011-06-30 16:50:27 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 02:50:35 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2011-11-26 01:12:08 +01:00
2011-11-26 01:12:08 +01:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-11-23 04:02:17 +01:00
2011-11-26 01:12:08 +01:00
2011-03-19 13:33:20 +00:00
2011-11-23 04:02:17 +01:00
2011-04-29 20:01:04 +02:00
2011-03-19 13:33:20 +00:00
2011-11-26 01:12:08 +01:00
2011-09-27 02:14:37 +02:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-10-10 03:50:58 +02:00
2011-03-19 13:33:20 +00:00
2011-09-21 21:25:43 +02:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2011-11-23 04:02:17 +01:00
2011-05-30 03:11:54 +02:00
2011-11-23 04:02:17 +01:00
2011-10-13 16:50:20 +02:00
2011-04-19 19:03:44 +02:00
2011-08-26 23:18:54 +02:00
2011-08-30 10:03:13 +02:00
2011-10-16 22:32:41 +02:00
2011-10-16 21:51:28 +02:00
2011-11-20 02:46:06 +01:00
2011-11-23 04:02:17 +01:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-11-06 11:52:59 +02:00
2011-10-12 05:40:57 +02:00
2011-03-19 13:33:20 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2010-01-16 04:49:02 +00:00
2011-10-22 19:49:27 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-10-13 06:00:03 +02:00
2011-11-05 23:25:20 +01:00
2011-11-23 04:02:17 +01:00
2011-08-26 23:18:54 +02:00
2011-06-29 05:23:12 +02:00
2011-11-23 04:02:17 +01:00
2011-07-04 00:45:21 +02:00
2011-11-23 04:02:17 +01:00
2011-10-11 22:03:19 +02:00
2011-11-23 04:02:17 +01:00
2011-11-20 15:02:36 +01:00
2011-11-23 04:02:17 +01:00
2011-11-17 02:44:33 +01:00
2011-11-17 02:44:33 +01:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2011-11-25 04:34:44 +01:00
2011-11-25 04:34:44 +01:00
2011-11-25 04:34:44 +01:00
2011-07-18 16:43:46 +02:00
2011-11-23 04:02:17 +01:00
2011-06-30 04:32:24 +02:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-11-24 16:55:45 +01:00
2011-11-24 16:55:45 +01:00
2011-07-05 02:26:17 +02:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2011-07-15 17:51:09 +02:00
2011-03-19 13:33:20 +00:00
2011-11-23 04:02:17 +01:00
2011-08-20 14:20:25 +02:00
2011-03-19 13:33:20 +00:00