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

..

ac3dsp_init.c

…

ac3dsp.asm

…

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

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

…

dsputil_avg_template.c

…

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

…

dsputil.asm

Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'

2013-03-01 13:39:47 +01:00

dsputilenc_mmx.c

Merge remote-tracking branch 'qatar/master'

2013-02-09 14:45:45 +01:00

dsputilenc.asm

…

dwt_yasm.asm

…

fdct.c

Merge remote-tracking branch 'qatar/master'

2013-02-09 14:45:45 +01:00

fft_init.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

fft.asm

…

fft.h

…

fmtconvert_init.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

fmtconvert.asm

…

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_10bit.asm

…

h264_chromamc.asm

…

h264_deblock_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_i386.h

…

h264_idct_10bit.asm

h264: integrate clear_blocks calls with IDCT.

2013-02-19 16:25:50 +01:00

h264_idct.asm

h264: integrate clear_blocks calls with IDCT.

2013-02-19 16:25:50 +01:00

h264_intrapred_10bit.asm

…

h264_intrapred_init.c

…

h264_intrapred.asm

…

h264_qpel_8bit.asm

Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'

2013-03-01 13:39:47 +01:00

h264_qpel_10bit.asm

…

h264_qpel.c

Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'

2013-02-27 11:59:31 +01:00

h264_weight_10bit.asm

…

h264_weight.asm

…

h264chroma_init.c

h264chroma: Remove duplicate 9/10 bit functions

2013-02-19 22:33:19 +02:00

h264dsp_init.c

…

hpeldsp.asm

…

idct_mmx_xvid.c

…

idct_mmx.c

…

idct_sse2_xvid.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

idct_xvid.h

…

imdct36.asm

…

lpc.c

…

Makefile

Merge remote-tracking branch 'qatar/master'

2013-02-19 12:41:27 +01:00

mathops.h

…

mlpdsp.c

…

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_template.c

…

mpegvideoenc.c

Merge remote-tracking branch 'qatar/master'

2013-02-09 14:45:45 +01:00

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

…

proresdsp.asm

…

rv34dsp_init.c

Remove unnecessary dsputil.h #includes

2013-02-26 00:51:34 +01:00

rv34dsp.asm

…

rv40dsp_init.c

…

rv40dsp.asm

…

sbrdsp_init.c

…

sbrdsp.asm

…

simple_idct.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

snowdsp.c

…

v210-init.c

…

v210.asm

…

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

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

…

videodsp.asm

…

vorbisdsp_init.c

…

vorbisdsp.asm

…

vp3dsp_init.c

…

vp3dsp.asm

…

vp8dsp_init.c

…

vp8dsp.asm

…

vp56_arith.h

…

vp56dsp_init.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

vp56dsp.asm

…

w64xmmtest.c

…