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>

diff --cc libavcodec/dpcm.c
Simple merge

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/mpc7.c
Simple merge

diff --cc libavcodec/shorten.c
Simple merge

diff --cc libavcodec/twinvq.c
Simple merge

diff --cc libavcodec/version.h
index f9328d8128b933ea1cb6e8e4c6a7469689a0c117,756ad1d2230c173b09d54ff597d317d9ebbc97ca..cd21d9504a45046cd152f6b7a93551eb05d116bb
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -21,7 -21,7 +21,7 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
- #define LIBAVCODEC_VERSION_MINOR 32
 -#define LIBAVCODEC_VERSION_MINOR 19
++#define LIBAVCODEC_VERSION_MINOR 33
  #define LIBAVCODEC_VERSION_MICRO  0
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavcodec/x86/dsputil_yasm.asm
Simple merge

diff --cc libavformat/aiff.h
Simple merge

diff --cc libavformat/http.c
Simple merge

diff --cc libavformat/httpauth.c
Simple merge

diff --cc libavformat/rtpdec.c
Simple merge

diff --cc libavformat/vqf.c
Simple merge

diff --cc libavutil/opt.c
Simple merge