Michael Niedermayer 6d1e9d993a Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836' ...

* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-01-23 17:52:21 +01:00

..

ac3dsp_init.c

…

ac3dsp.asm

x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly

2013-01-21 23:54:32 +01:00

cabac.h

avcodec/x86/cabac: workaround llvm 4.2.1 bug

2013-01-22 03:43:29 +01:00

cavsdsp.c

…

dct32.asm

…

deinterlace.asm

…

dirac_dwt.c

…

dirac_dwt.h

…

diracdsp_mmx.c

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_avg_template.c

…

dsputil_mmx.c

Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

2013-01-23 17:52:21 +01:00

dsputil_mmx.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_qns_template.c

…

dsputil_rnd_template.c

Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

2013-01-23 17:52:21 +01:00

dsputil.asm

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

2013-01-23 14:31:55 +01:00

dsputilenc_mmx.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputilenc.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dwt_yasm.asm

…

fdct.c

…

fft_init.c

…

fft.asm

…

fft.h

…

fmtconvert_init.c

…

fmtconvert.asm

…

h264_chromamc_10bit.asm

…

h264_chromamc.asm

…

h264_deblock_10bit.asm

…

h264_deblock.asm

…

h264_i386.h

…

h264_idct_10bit.asm

…

h264_idct.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

h264_intrapred_10bit.asm

…

h264_intrapred_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

h264_intrapred.asm

…

h264_qpel_8bit.asm

…

h264_qpel_10bit.asm

…

h264_qpel.c

…

h264_weight_10bit.asm

…

h264_weight.asm

…

h264dsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

idct_mmx_xvid.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

imdct36.asm

…

lpc.c

…

Makefile

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

2013-01-23 17:00:26 +01:00

mathops.h

…

mlpdsp.c

…

motion_est.c

…

mpegaudiodec.c

…

mpegvideo.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

mpegvideoenc_template.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

mpegvideoenc.c

…

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

proresdsp.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

rv34dsp_init.c

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

rv34dsp.asm

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

rv40dsp_init.c

…

rv40dsp.asm

…

sbrdsp_init.c

…

sbrdsp.asm

…

simple_idct.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

snowdsp.c

…

v210-init.c

…

v210.asm

…

vc1dsp_init.c

…

vc1dsp_mmx.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

…

videodsp.asm

…

vorbisdsp_init.c

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

2013-01-23 17:00:26 +01:00

vorbisdsp.asm

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

2013-01-23 17:00:26 +01:00

vp3dsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp3dsp.asm

…

vp8dsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp8dsp.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

…

w64xmmtest.c

…