1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer ec7ecb8811 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
  ARM: use =const syntax instead of explicit literal pools
  ARM: use standard syntax for all LDRD/STRD instructions
  fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
  dct-test: allow to compile without HAVE_INLINE_ASM.
  x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
  dca: Move tables used outside of dcadec.c to a separate file.
  dca: Rename dca.c ---> dcadec.c
  x86: h264dsp: Remove unused variable ff_pb_3_1
  apetag: change a forgotten return to return 0

Conflicts:
	libavcodec/Makefile
	libavcodec/dca.c
	libavcodec/x86/fft_3dn.c
	libavcodec/x86/fft_3dn2.c
	libavcodec/x86/fft_mmx.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01 23:33:06 +02: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 Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c dwt: Fix several warnings about incompatible pointer type 2012-07-27 19:36:17 +02:00
dwt.h
fdct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
fft_3dn2.c fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. 2012-07-31 21:20:47 -07:00
fft_3dn.c fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. 2012-07-31 21:20:47 -07:00
fft_mmx.asm fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. 2012-07-31 21:20:47 -07:00
fft.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
fft.h
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc_10bit.asm h264_chromamc_10bit: port x86 simd to cpuflags. 2012-07-27 17:35:49 -07:00
h264_chromamc.asm
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
h264_i386.h
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-07-07 20:29:43 +02:00
h264_qpel_10bit.asm
h264_qpel_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
idct_mmx.c x86/dsputil: put inline asm under HAVE_INLINE_ASM. 2012-07-25 14:24:27 -04:00
idct_sse2_xvid.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c
Makefile fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. 2012-07-31 21:20:47 -07:00
mathops.h
mlpdsp.c
motion_est_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
mpegvideo_mmx_template.c
mpegvideo_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
pngdsp-init.c
pngdsp.asm
proresdsp-init.c
proresdsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
rv34dsp_init.c
rv34dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
snowdsp_mmx.c
v210-init.c
v210.asm
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00
vp56_arith.h
vp56dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
w64xmmtest.c