Michael Niedermayer 4104eb44e6 Merge commit '55519926ef855c671d084ccc151056de9e3d3a77' ... * commit '55519926ef855c671d084ccc151056de9e3d3a77': x86: Make function prototype comments in assembly code consistent Conflicts: libavcodec/x86/sbrdsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-14 00:01:30 +01:00
..
ac3dsp_init.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
ac3dsp.asm	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
cabac.h	Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'	2014-03-05 21:33:44 +01:00
cavsdsp.c
constants.c
constants.h
dca.h	Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'	2014-02-19 15:44:48 +01:00
dcadsp_init.c	Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'	2014-03-06 14:10:27 +01:00
dcadsp.asm	x86/synth_filter: add synth_filter_fma3	2014-03-05 01:58:16 +01:00
dct32.asm
dct_init.c
deinterlace.asm	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c
dsputil_init.c	Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'	2014-03-13 23:41:17 +01:00
dsputil_mmx.c
dsputil_qns_template.c
dsputil_x86.c
dsputil_x86.h	Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'	2014-03-13 23:41:17 +01:00
dsputil.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
dsputilenc_mmx.c
dsputilenc.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
dwt_yasm.asm
fdct.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
fft_init.c
fft.asm
fft.h
flacdsp_init.c	x86/fladsp: add missing check to ff_flacdsp_init_x86()	2014-02-16 12:06:04 +01:00
flacdsp.asm	x86: Move XOP emulation to x86util	2014-02-24 08:30:19 +01:00
fmtconvert_init.c
fmtconvert.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
fpel_mmx.c
fpel.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h263_loopfilter.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h263dsp_init.c
h264_chromamc_10bit.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_chromamc.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_deblock_10bit.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_deblock.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_i386.h
h264_idct_10bit.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_idct.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_intrapred_10bit.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_intrapred_init.c
h264_intrapred.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_qpel_8bit.asm
h264_qpel_10bit.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_qpel.c
h264_weight_10bit.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264_weight.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
h264chroma_init.c
h264dsp_init.c
hpeldsp_init.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
hpeldsp_mmx.c
hpeldsp_rnd_template.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
hpeldsp.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
imdct36.asm	x86/imdct36: use sse3 instructions in the last BUTTERF step when possible	2014-02-27 23:28:15 +01:00
lossless_videodsp_init.c
lossless_videodsp.asm
lpc.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
Makefile	tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}	2014-02-17 13:51:19 +01:00
mathops.h
mlpdsp.c
motion_est.c
mpeg4qpel.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
mpegaudiodsp.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
mpegvideo.c
mpegvideoenc_template.c	x86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT	2014-03-13 05:50:28 -07:00
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm
proresdsp_init.c	Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'	2014-02-28 17:13:00 +01:00
proresdsp.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
qpel.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
rnd_mmx.c
rnd_template.c	Merge commit '831a1180785a786272cdcefb71566a770bfb879e'	2014-03-13 23:59:56 +01:00
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c
rv40dsp.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
sbrdsp_init.c
sbrdsp.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
simple_idct.c	Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'	2014-03-13 23:41:17 +01:00
snowdsp.c
ttadsp_init.c	tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}	2014-02-17 13:51:19 +01:00
ttadsp.asm	tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}	2014-02-17 13:51:19 +01:00
v210-init.c
v210.asm
vc1dsp_init.c
vc1dsp_mmx.c
vc1dsp.asm
vc1dsp.h
videodsp_init.c
videodsp.asm
vorbisdsp_init.c
vorbisdsp.asm
vp3dsp_init.c
vp3dsp.asm
vp6dsp_init.c
vp6dsp.asm
vp8dsp_init.c
vp8dsp_loopfilter.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
vp8dsp.asm	Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'	2014-03-14 00:01:30 +01:00
vp9dsp_init.c	vp9/x86: intra prediction SIMD.	2014-02-17 13:39:00 +01:00
vp9intrapred.asm	vp9/x86: set correct number of registers used in intra pred asm	2014-02-18 17:20:14 +01:00
vp9itxfm.asm
vp9lpf.asm
vp9mc.asm
vp56_arith.h
w64xmmtest.c