Michael Niedermayer 6f5f7f705d Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a' ...

* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
  Remove INIT_AVX from x86inc.asm.
  Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
  dv: fix indentation

Conflicts:
	libavformat/dv.c

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

2012-10-30 15:28:24 +01:00

..

ac3dsp_init.c

…

ac3dsp.asm

…

cabac.h

…

cavsdsp.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

dct32.asm

…

deinterlace.asm

…

diracdsp_mmx.c

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

…

dsputil_avg_template.c

…

dsputil_mmx.c

x86/dsputil_mmx: change assert() to av_assert()

2012-10-10 04:49:41 +02:00

dsputil_mmx.h

…

dsputil_qns_template.c

…

dsputil_rnd_template.c

…

dsputil.asm

…

dsputilenc_mmx.c

…

dsputilenc.asm

…

dwt_yasm.asm

…

dwt.c

…

dwt.h

…

fdct.c

…

fft_init.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

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

…

h264_intrapred_10bit.asm

Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'

2012-10-30 15:28:24 +01:00

h264_intrapred_init.c

Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'

2012-10-30 15:28:24 +01:00

h264_intrapred.asm

…

h264_qpel_10bit.asm

…

h264_qpel.c

…

h264_weight_10bit.asm

…

h264_weight.asm

…

h264dsp_init.c

…

idct_mmx_xvid.c

…

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

…

imdct36.asm

…

lpc.c

…

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

mathops.h

…

mlpdsp.c

Merge remote-tracking branch 'qatar/master'

2012-10-11 15:55:41 +02:00

motion_est.c

x86/motion_est: widen before multiply.

2012-10-16 03:09:28 +02:00

mpegaudiodec.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

mpegvideo.c

…

mpegvideoenc_template.c

…

mpegvideoenc.c

…

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

…

proresdsp.asm

…

rv34dsp_init.c

…

rv34dsp.asm

…

rv40dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

rv40dsp.asm

…

sbrdsp_init.c

…

sbrdsp.asm

…

simple_idct.c

…

snowdsp.c

…

v210-init.c

…

v210.asm

…

vc1dsp_init.c

x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)

2012-10-08 11:54:05 +02:00

vc1dsp_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

vc1dsp.asm

…

vc1dsp.h

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

vp3dsp_init.c

…

vp3dsp.asm

…

vp8dsp_init.c

…

vp8dsp.asm

…

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

…

w64xmmtest.c

…