Michael Niedermayer fb61ed1e9f Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f' ...

* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
  On2 VP7 decoder

Conflicts:
	Changelog
	libavcodec/arm/h264pred_init_arm.c
	libavcodec/arm/vp8dsp.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/arm/vp8dsp_init_armv6.c
	libavcodec/arm/vp8dsp_init_neon.c
	libavcodec/avcodec.h
	libavcodec/h264pred.c
	libavcodec/version.h
	libavcodec/vp8.c
	libavcodec/vp8.h
	libavcodec/vp8data.h
	libavcodec/vp8dsp.c
	libavcodec/vp8dsp.h
	libavcodec/x86/h264_intrapred_init.c
	libavcodec/x86/vp8dsp_init.c

See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-04 14:46:10 +02:00

..

ac3dsp_init.c

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

ac3dsp.asm

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

cabac.h

Use intel compliant CDQ instead of CLTD in inline asm.

2014-03-30 23:14:36 +02:00

cavsdsp.c

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

2014-03-22 23:08:22 +01:00

constants.c

…

constants.h

Add missing external declarations.

2014-03-17 00:48:09 +01:00

dca.h

Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'

2014-02-19 15:44:48 +01:00

dcadsp_init.c

Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'

2014-03-06 14:10:27 +01:00

dcadsp.asm

x86/synth_filter: improve FMA version

2014-03-17 21:04:15 +01:00

dct32.asm

…

dct_init.c

…

deinterlace.asm

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

dirac_dwt.c

…

dirac_dwt.h

…

diracdsp_mmx.c

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc_init.c

x86: convert DNxHDenc inline asm to yasm

2014-03-27 23:16:17 +01:00

dnxhdenc.asm

x86: convert DNxHDenc inline asm to yasm

2014-03-27 23:16:17 +01:00

dsputil_init.c

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

2014-03-22 23:08:22 +01:00

dsputil_mmx.c

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

2014-03-22 23:08:22 +01:00

dsputil_qns_template.c

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01:00

dsputil_x86.c

…

dsputil_x86.h

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

2014-03-22 23:21:54 +01:00

dsputil.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

dsputilenc_mmx.c

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

2014-03-20 22:36:40 +01:00

dsputilenc.asm

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

2014-03-20 22:36:40 +01:00

dwt_yasm.asm

…

fdct.c

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

fft_init.c

…

fft.asm

…

fft.h

…

flacdsp_init.c

x86/fladsp: add missing check to ff_flacdsp_init_x86()

2014-02-16 12:06:04 +01:00

flacdsp.asm

x86: Move XOP emulation to x86util

2014-02-24 08:30:19 +01:00

fmtconvert_init.c

…

fmtconvert.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

fpel_mmx.c

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

2014-03-22 23:08:22 +01:00

fpel.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

fpel.h

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

2014-03-22 23:08:22 +01:00

h263_loopfilter.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h263dsp_init.c

…

h264_chromamc_10bit.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_chromamc.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_deblock_10bit.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_deblock.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_i386.h

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

h264_idct_10bit.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_idct.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_intrapred_10bit.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_intrapred_init.c

Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

2014-04-04 14:46:10 +02:00

h264_intrapred.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_qpel_8bit.asm

…

h264_qpel_10bit.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_qpel.c

x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

2014-03-26 12:00:01 +01:00

h264_weight_10bit.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264_weight.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

h264chroma_init.c

…

h264dsp_init.c

…

hpeldsp_init.c

Merge remote-tracking branch 'qatar/master'

2014-03-26 16:55:46 +01:00

hpeldsp_mmx.c

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

2014-03-22 23:21:54 +01:00

hpeldsp_rnd_template.c

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01:00

hpeldsp.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

hpeldsp.h

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

2014-03-22 23:21:54 +01:00

idct_mmx_xvid.c

…

idct_sse2_xvid.c

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

idct_xvid.h

…

imdct36.asm

x86/imdct36: use sse3 instructions in the last BUTTERF step when possible

2014-02-27 23:28:15 +01:00

inline_asm.h

Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

2014-03-22 22:11:27 +01:00

lossless_videodsp_init.c

avcodec/x86/lossless_videodsp: disable median optimizations for 16bps

2014-01-23 01:51:24 +01:00

lossless_videodsp.asm

avcodec/x86/lossless_videodsp: fix w type

2014-02-15 06:41:38 +01:00

lpc.c

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

Makefile

On2 VP7 decoder

2014-04-04 04:00:11 +02:00

mathops.h

Use intel compliant CDQ instead of CLTD in inline asm.

2014-03-30 23:14:36 +02:00

mlpdsp.c

avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported

2014-03-18 23:37:50 +01:00

motion_est.c

Additional icl inline asm fix.

2014-03-22 14:07:03 +01:00

mpeg4qpel.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

mpegaudiodsp.c

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

mpegvideo.c

…

mpegvideoenc_template.c

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01:00

mpegvideoenc.c

…

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'

2014-02-28 17:13:00 +01:00

proresdsp.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

qpel.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

rnd_template.c

Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

2014-03-22 22:11:27 +01:00

rv34dsp_init.c

Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'

2014-01-09 20:24:15 +01:00

rv34dsp.asm

…

rv40dsp_init.c

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

2014-03-22 23:21:54 +01:00

rv40dsp.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

sbrdsp_init.c

…

sbrdsp.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

simple_idct.c

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

snowdsp.c

avcodec/x86/snowdsp: add missing clobbers to inner_add_yblock_bw_8_obmc_16_bh_even_sse2() and inner_add_yblock_bw_16_obmc_32_sse2()

2014-03-21 03:38:48 +01:00

ttadsp_init.c

tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}

2014-02-17 13:51:19 +01:00

ttadsp.asm

tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}

2014-02-17 13:51:19 +01:00

v210-init.c

…

v210.asm

…

vc1dsp_init.c

x86: dsputil: Move fpel declarations to a separate header

2014-03-22 06:17:29 -07:00

vc1dsp_mmx.c

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

2014-03-22 23:08:22 +01:00

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'

2014-01-31 14:30:30 +01:00

videodsp.asm

x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.

2014-01-30 15:33:23 +01:00

vorbisdsp_init.c

…

vorbisdsp.asm

…

vp3dsp_init.c

…

vp3dsp.asm

…

vp6dsp_init.c

Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'

2014-01-09 20:24:15 +01:00

vp6dsp.asm

…

vp8dsp_init.c

Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

2014-04-04 14:46:10 +02:00

vp8dsp_loopfilter.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

vp8dsp.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

2014-03-14 00:01:30 +01:00

vp9dsp_init.c

x86/vp9mc: add vp9 namespace.

2014-03-29 18:13:15 +01:00

vp9intrapred.asm

vp9/x86: set correct number of registers used in intra pred asm

2014-02-18 17:20:14 +01:00

vp9itxfm.asm

vp9/x86: use explicit register for relative stack references.

2014-01-24 19:25:25 -05:00

vp9lpf.asm

x86/vp9lpf: simplify 2nd transpose in 44/48/88/84.

2014-02-08 11:10:23 +01:00

vp9mc.asm

x86/vp9mc: add vp9 namespace.

2014-03-29 18:13:15 +01:00

vp56_arith.h

…

w64xmmtest.c

…