1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 268098d8b2 Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  amrwb: remove duplicate arguments from extrapolate_isf().
  amrwb: error out early if mode is invalid.
  h264: change underread for 10bit QPEL to overread.
  matroska: check buffer size for RM-style byte reordering.
  vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
  vp8: change int stride to ptrdiff_t stride.
  wma: fix invalid buffer size assumptions causing random overreads.
  Windows Media Audio Lossless decoder
  rv10/20: Fix slice overflow with checked bitstream reader.
  h263dec: Disallow width/height changing with frame threads.
  rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
  rmdec: Honor .RMF tag size rather than assuming 18.
  g722: Fix the QMF scaling
  r3d: don't set codec timebase.
  electronicarts: set timebase for tgv video.
  electronicarts: parse the framerate for cmv video.
  ogg: don't set codec timebase
  electronicarts: don't set codec timebase
  avs: don't set codec timebase
  wavpack: Fix an integer overflow
  ...

Conflicts:
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/msmpeg4.c
	libavcodec/pnmdec.c
	libavcodec/qpeg.c
	libavcodec/rawenc.c
	libavcodec/ulti.c
	libavcodec/vcr1.c
	libavcodec/version.h
	libavcodec/wmalosslessdec.c
	libavformat/electronicarts.c
	libswscale/ppc/yuv2rgb_altivec.c
	tests/ref/acodec/g722
	tests/ref/fate/ea-cmv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-03 00:23:10 +01:00
..
ac3dsp_mmx.c
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-02-11 01:22:22 +01:00
cabac.h cabac: Try to disable problematic ASM for gcc-llvm 4.2.1 2012-01-11 22:30:21 +01:00
cavsdsp_mmx.c
dct32_sse.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm dirac_yasm: fix linking failure due to %ifndef 2012-01-28 09:06: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' 2012-02-16 01:34:37 +01:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputil_yasm.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dwt_yasm.asm dirac_yasm: fix linking failure due to %ifndef 2012-01-28 09:06:03 +01:00
dwt.c
dwt.h
fdct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft_3dn2.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
fft_sse.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft.h
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_chromamc_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-02-28 03:38:58 +01:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
h264_i386.h Revert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b" 2012-01-09 03:32:06 +01:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_intrapred_init.c Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
h264_qpel_10bit.asm h264: change underread for 10bit QPEL to overread. 2012-03-02 10:33:05 -08:00
h264_qpel_mmx.c
h264_weight_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264dsp_mmx.c Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
idct_mmx.c cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
mathops.h
mlpdsp.c
motion_est_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
mpegvideo_mmx_template.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegvideo_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pngdsp-init.c Merge remote-tracking branch 'qatar/master' 2012-01-31 02:46:26 +01:00
pngdsp.asm Partially revert "Fix png decoding on x86." 2012-02-10 23:18:52 +01:00
proresdsp-init.c
proresdsp.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
rv34dsp_init.c rv34: change most "int stride" into "ptrdiff_t stride". 2012-02-20 14:58:25 -08:00
rv34dsp.asm Use correct register size. 2012-01-17 08:41:39 +01:00
rv40dsp_init.c rv34: change most "int stride" into "ptrdiff_t stride". 2012-02-20 14:58:25 -08:00
rv40dsp.asm Fix NASM compilation. 2012-02-03 20:42:30 +01:00
sbrdsp_init.c SBR DSP x86: implement SSE sbr_hf_g_filt 2012-02-23 15:50:09 -08:00
sbrdsp.asm SBR DSP x86: implement SSE sbr_hf_g_filt 2012-02-23 15:50:09 -08:00
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
v210.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
w64xmmtest.c win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00