1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 2cf9ab6555 Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'
* commit '8a4f26206d7914eaf2903954ce97cb7686933382':
  dsputil: remove butterflies_float_interleave.
  srtp: Move a variable to a local scope
  srtp: Add tests for the crypto suite with 32/80 bit HMAC

Conflicts:
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 15:18:57 +01:00
..
ac3dsp_init.c x86/ac3dsp_init: try to workaround ICC failure. 2012-12-23 19:27:19 +01:00
ac3dsp.asm Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668' 2013-01-15 15:23:20 +01:00
cabac.h
cavsdsp.c
dct32.asm
deinterlace.asm
dirac_dwt.c lavc: split snow and dirac DWTs 2013-01-14 22:59:05 +01:00
dirac_dwt.h lavc: split snow and dirac DWTs 2013-01-14 22:59:05 +01:00
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm x86/dirac: fix asm on win64 2013-01-14 23:28:01 +01:00
dnxhdenc.c
dsputil_avg_template.c Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca' 2013-01-21 13:38:57 +01:00
dsputil_mmx.c Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382' 2013-01-21 15:18:57 +01:00
dsputil_mmx.h
dsputil_qns_template.c
dsputil_rnd_template.c
dsputil.asm Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382' 2013-01-21 15:18:57 +01:00
dsputilenc_mmx.c dsputil_mmx: switch to av_assert2() 2012-12-10 14:41:31 +01:00
dsputilenc.asm Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668' 2013-01-15 15:23:20 +01:00
dwt_yasm.asm x86/dirac: fix asm on win64 2013-01-14 23:28:01 +01:00
fdct.c
fft_init.c
fft.asm
fft.h
fmtconvert_init.c
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e' 2013-01-16 11:44:45 +01:00
h264_deblock_10bit.asm
h264_deblock.asm x86inc: support stack mem allocation and re-alignment in PROLOGUE. 2012-12-12 10:37:52 +01:00
h264_i386.h
h264_idct_10bit.asm
h264_idct.asm Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1' 2012-11-28 13:32:17 +01:00
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_8bit.asm
h264_qpel_10bit.asm
h264_qpel.c
h264_weight_10bit.asm
h264_weight.asm Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
h264dsp_init.c x86inc: support stack mem allocation and re-alignment in PROLOGUE. 2012-12-12 10:37:52 +01:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36.asm
lpc.c
Makefile Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda' 2013-01-20 14:13:16 +01:00
mathops.h
mlpdsp.c
motion_est.c Drop Snow codec 2013-01-06 16:30:02 +01:00
mpegaudiodec.c
mpegvideo.c libavcodec/x86/mpegvideo: switch to av_assert2 2012-12-10 23:30:16 +01:00
mpegvideoenc_template.c
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm
proresdsp_init.c
proresdsp.asm
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c
rv40dsp.asm
sbrdsp_init.c x86: sbrdsp: Implement SSE qmf_post_shuffle 2013-01-06 13:57:01 +01:00
sbrdsp.asm Merge commit '4f50646697606df39317b93c2a427603b77636ee' 2013-01-07 01:51:10 +01:00
simple_idct.c
snowdsp.c lavc: split snow and dirac DWTs 2013-01-14 22:59:05 +01:00
v210-init.c
v210.asm
vc1dsp_init.c
vc1dsp_mmx.c
vc1dsp.asm
vc1dsp.h
videodsp_init.c videodsp: Fix project name 2012-12-22 00:58:08 +01:00
videodsp.asm videodsp: Fix project name 2012-12-22 00:58:08 +01:00
vorbisdsp_init.c Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda' 2013-01-20 14:13:16 +01:00
vp3dsp_init.c Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a' 2013-01-20 13:57:10 +01:00
vp3dsp.asm Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a' 2013-01-20 13:57:10 +01:00
vp8dsp_init.c x86inc: support stack mem allocation and re-alignment in PROLOGUE. 2012-12-12 10:37:52 +01:00
vp8dsp.asm x86inc: support stack mem allocation and re-alignment in PROLOGUE. 2012-12-12 10:37:52 +01:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c