FFmpeg/libavcodec
Michael Niedermayer 2acb5cd907 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libopus: Remap channels using libopus' internal remapping.
  Opus decoder using libopus
  avcodec: document the use of AVCodecContext.delay for audio decoding
  vc1dec: add flush function for WMV9 and VC-1 decoders
  http: Increase buffer sizes to cope with longer URIs
  nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
  h264_refs: Fix debug tprintf argument types
  golomb: const correctness for get_ue()/get_se() function arguments
  get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h
	libavformat/http.c

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