ffmpeg/libavcodec/x86
Michael Niedermayer 1a7166a58d Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'
* commit 'e8c52271c45ec27d783e74238dcfad0c2008731c':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
	libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:39:47 +01:00
..
Makefile Merge remote-tracking branch 'qatar/master' 2013-02-19 12:41:27 +01:00
ac3dsp.asm
ac3dsp_init.c
cabac.h
cavsdsp.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
dct32.asm
deinterlace.asm
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c dirac: Only use MMX if MMX is available. 2013-01-28 20:00:55 +01:00
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
dsputil.asm Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c' 2013-03-01 13:39:47 +01:00
dsputil_avg_template.c Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8' 2013-02-06 12:18:25 +01:00
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2013-02-27 12:35:18 +01:00
dsputil_mmx.h Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd' 2013-02-27 11:59:31 +01:00
dsputil_qns_template.c
dsputil_rnd_template.c Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8' 2013-02-06 12:18:25 +01:00
dsputilenc.asm
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2013-02-09 14:45:45 +01:00
dwt_yasm.asm
fdct.c Merge remote-tracking branch 'qatar/master' 2013-02-09 14:45:45 +01:00
fft.asm
fft.h
fft_init.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
fmtconvert.asm
fmtconvert_init.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
h263_loopfilter.asm x86/h263_loopfilter: Fix author attribution after code has been moved/splited around 2013-02-19 12:51:00 +01:00
h264_chromamc.asm
h264_chromamc_10bit.asm
h264_deblock.asm Fix Win64 AVX h264_deblock by not using redzone on Win64 2013-02-21 22:38:56 +01:00
h264_deblock_10bit.asm
h264_i386.h
h264_idct.asm h264: integrate clear_blocks calls with IDCT. 2013-02-19 16:25:50 +01:00
h264_idct_10bit.asm h264: integrate clear_blocks calls with IDCT. 2013-02-19 16:25:50 +01:00
h264_intrapred.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
h264_qpel.c Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd' 2013-02-27 11:59:31 +01:00
h264_qpel_8bit.asm Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c' 2013-03-01 13:39:47 +01:00
h264_qpel_10bit.asm
h264_weight.asm
h264_weight_10bit.asm
h264chroma_init.c h264chroma: Remove duplicate 9/10 bit functions 2013-02-19 22:33:19 +02:00
h264dsp_init.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
hpeldsp.asm Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8' 2013-02-06 12:18:25 +01:00
idct_mmx.c
idct_mmx_xvid.c
idct_sse2_xvid.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
idct_xvid.h
imdct36.asm
lpc.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
mathops.h
mlpdsp.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
motion_est.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
mpeg4qpel.asm Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b' 2013-02-12 13:26:22 +01:00
mpegaudiodec.c Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9' 2013-02-09 14:33:57 +01:00
mpegvideo.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
mpegvideoenc.c Merge remote-tracking branch 'qatar/master' 2013-02-09 14:45:45 +01:00
mpegvideoenc_template.c
pngdsp.asm
pngdsp_init.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
proresdsp.asm
proresdsp_init.c
rv34dsp.asm
rv34dsp_init.c Remove unnecessary dsputil.h #includes 2013-02-26 00:51:34 +01:00
rv40dsp.asm
rv40dsp_init.c Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc' 2013-02-07 13:35:49 +01:00
sbrdsp.asm
sbrdsp_init.c Add av_cold attributes to arch-specific init functions 2013-02-05 17:01:05 +01:00
simple_idct.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
snowdsp.c
v210-init.c
v210.asm
vc1dsp.asm
vc1dsp.h
vc1dsp_init.c x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c 2013-02-26 23:36:24 +01:00
vc1dsp_mmx.c Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e' 2013-02-27 12:22:10 +01:00
videodsp.asm
videodsp_init.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
vorbisdsp.asm
vorbisdsp_init.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
vp3dsp.asm
vp3dsp_init.c put_vp_no_rnd_pixels8_l2_mmx: fix type 2013-02-03 17:21:06 +01:00
vp8dsp.asm
vp8dsp_init.c
vp56_arith.h
vp56dsp.asm
vp56dsp_init.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
w64xmmtest.c