FFmpeg/libavcodec/x86
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
..
ac3dsp_mmx.c
ac3dsp.asm
cabac.h
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c
dsputil_mmx.h
dsputil_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c
Makefile
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c
mpegvideo_mmx.c
png_mmx.c
proresdsp-init.c
proresdsp.asm
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c
v210.asm
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm