Michael Niedermayer 84833b028b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  aacdec: Drop some unused function arguments
  x86: Fix assembly with NASM
  x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags

Conflicts:
	libavcodec/aacdec.c

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

2012-10-31 14:27:11 +01:00

..

ac3dsp_init.c

…

ac3dsp.asm

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

cabac.h

…

cavsdsp.c

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

dct32.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

deinterlace.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

diracdsp_mmx.c

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

dnxhdenc.c

…

dsputil_avg_template.c

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

dsputil_mmx.c

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

dsputil_mmx.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

dsputil_qns_template.c

…

dsputil_rnd_template.c

…

dsputil.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

dsputilenc_mmx.c

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

dsputilenc.asm

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

dwt_yasm.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

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

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

fft.h

…

fmtconvert_init.c

…

fmtconvert.asm

Merge remote-tracking branch 'qatar/master'

2012-10-31 14:27:11 +01:00

h264_chromamc_10bit.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

h264_chromamc.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_deblock_10bit.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_deblock.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_i386.h

…

h264_idct_10bit.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_idct.asm

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

h264_intrapred_10bit.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_intrapred_init.c

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01:00

h264_intrapred.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_qpel_10bit.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

h264_qpel.c

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

h264_weight_10bit.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

h264_weight.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264dsp_init.c

…

idct_mmx_xvid.c

…

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

…

imdct36.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

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

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

mpegvideoenc_template.c

…

mpegvideoenc.c

…

pngdsp_init.c

…

pngdsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

proresdsp_init.c

…

proresdsp.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

rv34dsp_init.c

…

rv34dsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

rv40dsp_init.c

Merge remote-tracking branch 'qatar/master'

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

rv40dsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

sbrdsp_init.c

…

sbrdsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

simple_idct.c

…

snowdsp.c

…

v210-init.c

…

v210.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

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

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

vc1dsp.h

Merge remote-tracking branch 'qatar/master'

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

vp3dsp_init.c

…

vp3dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

vp8dsp_init.c

…

vp8dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

w64xmmtest.c

…