ffmpeg/libavformat
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-14 07:22:31 +01:00
2011-11-05 16:51:25 +01:00
2011-11-15 13:06:36 +01:00
2011-11-08 00:36:45 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-11-08 17:39:39 +01:00
2011-10-29 22:08:25 +02:00
2011-11-22 18:57:01 +01:00
2011-11-03 20:21:01 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-11-02 20:41:24 +01:00
2011-08-09 19:56:25 +02:00
2011-06-02 20:06:00 +01:00
2011-10-13 16:50:20 +02:00
2011-11-12 01:21:01 +01:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-10-17 16:51:48 +02:00
2011-11-18 10:59:53 +02:00
2011-11-06 11:53:05 +02:00
2011-11-06 01:53:46 +01:00