FFmpeg/libavcodec
Michael Niedermayer e4de71677f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aac_latm: reconfigure decoder on audio specific config changes
  latmdec: fix audio specific config parsing
  Add avcodec_decode_audio4().
  avcodec: change number of plane pointers from 4 to 8 at next major bump.
  Update developers documentation with coding conventions.
  svq1dec: avoid undefined get_bits(0) call
  ARM: h264dsp_neon cosmetics
  ARM: make some NEON macros reusable
  Do not memcpy raw video frames when using null muxer
  fate: update asf seektest
  vp8: flush buffers on size changes.
  doc: improve general documentation for MacOSX
  asf: use packet dts as approximation of pts
  asf: do not call av_read_frame
  rtsp: Initialize the media_type_mask in the rtp guessing demuxer
  Cleaned up alacenc.c

Conflicts:
	doc/APIchanges
	doc/developer.texi
	libavcodec/8svx.c
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/nellymoserdec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/asfdec.c
	tests/ref/seek/lavf_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03 03:00:30 +01:00
..
2011-11-29 19:55:38 +01:00
2011-11-27 21:19:07 +01:00
2011-11-25 13:19:54 +00:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01:00
2011-12-02 00:21:24 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-14 18:14:20 +01:00
2011-11-05 00:02:31 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-11-09 23:10:07 +01:00
2011-12-02 17:40:40 -05:00
2011-12-02 17:40:40 -05:00
2011-11-19 04:07:26 +01:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-10-26 14:32:01 +02:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2011-11-27 03:11:08 +01:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-10-21 02:27:33 +02:00
2011-11-24 15:39:41 +01:00
2011-11-02 02:26:28 +01:00
2011-11-11 18:40:19 +01:00
2011-11-12 20:15:21 +01:00
2011-10-27 14:34:45 +02:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-11-12 20:17:56 +01:00
2011-12-02 03:23:07 +01:00
2011-11-12 20:21:07 +01:00
2011-12-01 18:46:22 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-12 20:49:53 +01:00