1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
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 Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
ac3dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
cabac.h Merge remote-tracking branch 'qatar/master' 2011-11-09 02:59:49 +01:00
cavsdsp_mmx.c
dct32_sse.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
deinterlace.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
diracdsp_mmx.c dirac: put_dirac_pixels8_mmx() does not work yet, thus disable it. 2011-10-30 23:27:38 +01:00
diracdsp_mmx.h DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
diracdsp_yasm.asm dirac: alignment for dirac_hpel_filter_v has been fixed 2011-10-31 17:03:03 +01:00
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +01:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +01:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
dwt_yasm.asm dirac: drop unused END_HORIZONTAL 2011-11-01 22:01:11 +01:00
dwt.c dirac: fix horizontal_compose_dd97i_ssse3 2011-11-01 22:01:11 +01:00
dwt.h DIRAC Decoder stable version, MMX support removed. 2011-10-30 21:50:08 +01:00
fdct_mmx.c Make fdct_r_row_sse2 const. 2011-11-05 15:37:02 +01:00
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
h264_chromamc_10bit.asm
h264_chromamc.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_deblock_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_deblock.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_i386.h Merge remote-tracking branch 'qatar/master' 2011-11-09 02:59:49 +01:00
h264_idct_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_idct.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred_10bit.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_intrapred_init.c h264: 4:2:2 intra decoding support 2011-10-21 01:00:41 -07:00
h264_intrapred.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm h264_weight: initialize "height" function argument properly. 2011-10-22 00:23:24 -07:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2011-11-06 02:23:34 +01:00
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
idct_mmx_xvid.c
idct_mmx.c Remove redundant filename self-references inside files. 2011-11-08 17:52:56 +01:00
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm mpegaudiodec: add SSE-optimized imdct36() 2011-11-07 22:35:55 +01:00
lpc_mmx.c
Makefile mpegaudiodec: add SSE-optimized imdct36() 2011-11-07 22:35:55 +01:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c mpegaudiodec: add SSE-optimized imdct36() 2011-11-07 22:35:55 +01:00
mpegvideo_mmx_template.c
mpegvideo_mmx.c
png_mmx.c
proresdsp-init.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
proresdsp.asm
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c Add V210 SIMD 2011-10-19 20:26:55 +02:00
v210.asm Add V210 SIMD 2011-10-19 20:26:55 +02:00
vc1dsp_mmx.c
vc1dsp_yasm.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp3dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
vp8dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Move x264asm to libavutil. 2011-10-19 20:26:55 +02:00