Files
FFmpeg/libavcodec
Michael Niedermayer 29582df797 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vble: remove vble_error_close
  VBLE Decoder
  tta: use an integer instead of a pointer to iterate output samples
  shorten: do not modify samples pointer when interleaving
  mpc7: only support stereo input.
  dpcm: do not try to decode empty packets
  dpcm: remove unneeded buf_size==0 check.
  twinvq: add SSE/AVX optimized sum/difference stereo interleaving
  vqf/twinvq: pass vqf COMM chunk info in extradata
  vqf: do not set bits_per_coded_sample for TwinVQ.
  twinvq: check for allocation failure in init_mdct_win()
  swscale: add padding to conversion buffer.
  rtpdec: Simplify finalize_packet
  http: Handle proxy authentication
  http: Print an error message for Authorization Required, too
  AVOptions: don't return an invalid option when option list is empty
  AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)

Conflicts:
	libavcodec/avcodec.h
	libavcodec/tta.c
	libavcodec/vble.c
	libavcodec/version.h
	libavutil/opt.c
	libswscale/utils.c

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