Michael Niedermayer 509f502902 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
  trasher: Include all the necessary headers
  x86: Remove some leftover declarations for non-existent functions
  ARM: libavresample: NEON optimised generic fltp to s16 conversion
  ARM: libavresample: NEON optimised stereo fltp to s16 conversion
  ARM: libavresample: NEON optimised flat float to s16 conversion

Conflicts:
	libavcodec/x86/dsputil_mmx.c

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

2012-09-14 14:13:38 +02:00

..

ac3dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

ac3dsp.asm

Add some missing _EXTERNAL suffixes to yasm source files.

2012-08-31 15:39:03 +02:00

cabac.h

Merge remote-tracking branch 'qatar/master'

2012-08-14 15:34:39 +02:00

cavsdsp.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dct32.asm

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

deinterlace.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

diracdsp_mmx.c

diracdsp: Fix unprotected inline asm

2012-09-11 22:59:43 +02:00

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil_avg_template.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

dsputil_mmx.h

x86: Remove some leftover declarations for non-existent functions

2012-09-13 21:38:47 +02:00

dsputil_qns_template.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil_rnd_template.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil.asm

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

dsputilenc_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

dsputilenc.asm

Merge remote-tracking branch 'qatar/master'

2012-08-13 14:38:43 +02:00

dwt_yasm.asm

…

dwt.c

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

dwt.h

…

fdct.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

fft_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

fft.asm

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

fft.h

Merge remote-tracking branch 'qatar/master'

2012-08-03 23:13:06 +02:00

fmtconvert_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

fmtconvert.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

h264_chromamc_10bit.asm

x86: Split inline and external assembly #ifdefs

2012-08-31 01:53:25 +02:00

h264_chromamc.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

h264_deblock_10bit.asm

Add some missing _EXTERNAL suffixes to yasm source files.

2012-08-31 15:39:03 +02:00

h264_deblock.asm

Add some missing _EXTERNAL suffixes to yasm source files.

2012-08-31 15:39:03 +02:00

h264_i386.h

Merge remote-tracking branch 'qatar/master'

2012-08-14 15:34:39 +02:00

h264_idct_10bit.asm

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

h264_idct.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

h264_intrapred_10bit.asm

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

h264_intrapred_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

h264_intrapred.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

h264_qpel_10bit.asm

x86: add colons after labels

2012-08-07 15:20:56 +01:00

h264_qpel.c

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

h264_weight_10bit.asm

x86: add colons after labels

2012-08-07 15:20:56 +01:00

h264_weight.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

h264dsp_init.c

x86/h264dsp_init: put a HAVE_YASM back

2012-09-09 17:21:02 +02:00

idct_mmx_xvid.c

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

idct_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

idct_sse2_xvid.c

idct_sse2_xvid: remove libavutil/internal.h include

2012-08-16 17:26:06 +02:00

idct_xvid.h

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

imdct36.asm

Add some missing _EXTERNAL suffixes to yasm source files.

2012-08-31 15:39:03 +02:00

lpc.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-09-10 14:06:20 +02:00

mathops.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

mlpdsp.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

motion_est.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

mpegaudiodec.c

x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx

2012-09-09 18:39:03 +02:00

mpegvideo.c

Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'

2012-08-24 14:30:40 +02:00

mpegvideoenc_template.c

Merge remote-tracking branch 'qatar/master'

2012-08-29 18:13:00 +02:00

mpegvideoenc.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

pngdsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

pngdsp.asm

x86: pngdsp: Fix assembly for OS/2

2012-08-08 15:45:09 +02:00

proresdsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

proresdsp.asm

Add some missing _EXTERNAL suffixes to yasm source files.

2012-08-31 15:39:03 +02:00

rv34dsp_init.c

x86: Replace checks for CPU extensions and flags by convenience macros

2012-09-08 18:18:34 +02:00

rv34dsp.asm

x86: use 32-bit source registers with movd instruction

2012-08-07 15:21:20 +01:00

rv40dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

rv40dsp.asm

x86: use 32-bit source registers with movd instruction

2012-08-07 15:21:20 +01:00

sbrdsp_init.c

x86: Replace checks for CPU extensions and flags by convenience macros

2012-09-08 18:18:34 +02:00

sbrdsp.asm

…

simple_idct.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

snowdsp.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

v210-init.c

Fix compilation with yasm-0.6.2.

2012-09-01 10:59:16 +02:00

v210.asm

Add some missing _EXTERNAL suffixes to yasm source files.

2012-08-31 15:39:03 +02:00

vc1dsp_mmx.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

vc1dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-08-13 14:38:43 +02:00

vp3dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

vp3dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

vp8dsp_init.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

vp8dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

vp56_arith.h

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

vp56dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

vp56dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

w64xmmtest.c

…