Michael Niedermayer cc3e7a4c3d Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310' ...

* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
  x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputilenc_mmx.c

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

2014-07-13 21:51:20 +02:00

..

ac3dsp_init.c

Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'

2014-04-05 19:05:00 +02:00

ac3dsp.asm

Merge commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5'

2014-04-05 19:36:21 +02:00

audiodsp_init.c

x86/audiodsp: move asm code out of dsputil

2014-06-22 19:53:09 +02:00

audiodsp.asm

x86/audiodsp: move asm code out of dsputil

2014-06-22 19:53:09 +02:00

blockdsp_init.c

Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'

2014-07-05 19:50:05 +02:00

blockdsp.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

bswapdsp_init.c

Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'

2014-06-23 13:31:26 +02:00

bswapdsp.asm

x86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm

2014-06-23 22:11:18 +02:00

cabac.h

inline asm: fix arrays as named constraints.

2014-05-07 15:02:45 +02:00

cavsdsp.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

constants.c

x86/vp9: inital AVX2 intra_pred

2014-06-08 02:37:20 +02:00

constants.h

x86/vp9: inital AVX2 intra_pred

2014-06-08 02:37:20 +02:00

dca.h

Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'

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

dcadsp_init.c

x86/synth_filter: remove the fma3 version ifdefs

2014-04-13 11:29:28 +02:00

dcadsp.asm

x86/synth_filter: remove the fma3 version ifdefs

2014-04-13 11:29:28 +02:00

dct32.asm

x86/dct32: don't build ff_dct32_float_sse on x86_64

2014-06-09 00:51:43 +02:00

dct_init.c

avcodec/x86/dct_init: fix build failure with clang && disable-optimizations

2014-06-09 19:32:41 +02:00

deinterlace.asm

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

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

dirac_dwt.c

…

dirac_dwt.h

…

diracdsp_mmx.c

x86: hpeldsp: propagate changes across codecs

2014-05-26 15:37:04 +02:00

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc_init.c

DNxHD: convert inline asm to yasm

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

dnxhdenc.asm

DNxHD: convert inline asm to yasm

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

dsputil_init.c

Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'

2014-07-13 21:51:20 +02:00

dsputil_x86.h

Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'

2014-07-13 21:51:20 +02:00

dsputilenc.asm

Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

2014-07-10 01:22:14 +02:00

dwt_yasm.asm

…

fdct.c

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

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

fdctdsp_init.c

Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'

2014-07-08 03:19:06 +02:00

fft_init.c

…

fft.asm

x86: Fix compilation with nasm on PPC & OS/2

2013-10-08 12:36:19 +02:00

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

Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

2013-08-30 12:50:01 +02:00

fmtconvert.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

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

fpel.asm

x86: kill fpel_mmx.c

2014-05-21 03:25:08 +02:00

fpel.h

x86: hpeldsp: propagate changes across codecs

2014-05-26 15:37:04 +02:00

h263_loopfilter.asm

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

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

h263dsp_init.c

Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

2013-11-08 17:42:56 +01:00

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 '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

h264_deblock.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

h264_i386.h

inline asm: fix arrays as named constraints.

2014-05-07 15:02:45 +02: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

x86: move horizontal add macros to x86util

2014-04-17 14:15:09 +02:00

h264_intrapred_init.c

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

h264_intrapred.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

h264_qpel_8bit.asm

…

h264_qpel_10bit.asm

avcodec/x86/h264_qpel_10bit: locally define pb_0

2014-06-24 02:13:43 +02:00

h264_qpel.c

x86: hpeldsp: propagate changes across codecs

2014-05-26 15:37:04 +02: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

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

h264dsp_init.c

Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

2014-06-26 02:58:59 +02:00

hevc_deblock.asm

x86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2

2014-07-13 13:48:31 +02:00

hevc_idct.asm

avcodec/x86/hevc_idct: fix function name in comment

2014-06-25 18:22:25 +02:00

hevc_mc.asm

x86: hevc_mc: remove unneeded shift

2014-06-01 23:34:33 +02:00

hevcdsp_init.c

x86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2

2014-07-13 13:48:31 +02:00

hevcdsp.h

avcodec/x86/hevc: add avx2 dc idct

2014-06-25 14:49:44 +02:00

hpeldsp_init.c

x86: hpeldsp: propagate changes across codecs

2014-05-26 15:37:04 +02:00

hpeldsp_rnd_template.c

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

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

hpeldsp.asm

x86: hpeldsp: better factorization

2014-05-29 21:47:40 +02:00

hpeldsp.h

x86: hpeldsp: propagate changes across codecs

2014-05-26 15:37:04 +02:00

huffyuvdsp_init.c

Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'

2014-07-05 19:11:26 +02:00

huffyuvdsp.asm

x86util: add and use RSHIFT/LSHIFT macros

2014-06-15 13:19:27 +02:00

huffyuvencdsp_mmx.c

Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'

2014-05-28 00:03:59 +02:00

idct_mmx_xvid.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

idct_sse2_xvid.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

idct_xvid.h

…

idctdsp_init.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

idctdsp_mmx.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

idctdsp.asm

x86: rename dsputil.asm to idctdsp.asm

2014-07-02 01:08:04 +02:00

idctdsp.h

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

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_audiodsp_init.c

apedsp: move to llauddsp

2014-06-05 20:31:59 +02:00

lossless_audiodsp.asm

apedsp: move to llauddsp

2014-06-05 20:31:59 +02:00

lossless_videodsp_init.c

rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16

2014-05-29 19:50:44 +02:00

lossless_videodsp.asm

avcodec/x86/lossless_videodsp: Fix size of values read for left/left_top

2014-06-19 05:53:41 +02:00

lpc.c

inline asm: fix arrays as named constraints.

2014-05-07 15:02:45 +02:00

Makefile

Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'

2014-07-13 21:51:20 +02:00

mathops.h

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +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

x86/motion_est: sad_{x, y}2_mmxext functions are bitexact

2014-06-04 00:48:35 +02:00

mpegaudiodsp.c

x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external

2014-05-06 14:15:02 +02:00

mpegvideo.c

Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'

2014-04-05 19:05:00 +02:00

mpegvideodsp.c

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

2014-06-23 21:10:10 +02:00

mpegvideoenc_qns_template.c

Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

2014-07-07 15:08:55 +02:00

mpegvideoenc_template.c

Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'

2014-07-04 01:17:39 +02:00

mpegvideoenc.c

Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'

2014-07-04 01:17:39 +02:00

mpegvideoencdsp_init.c

Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'

2014-07-07 16:17:27 +02:00

mpegvideoencdsp.asm

Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'

2014-07-07 15:36:58 +02:00

pixblockdsp_init.c

Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

2014-07-10 01:22:14 +02:00

pixblockdsp.asm

Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

2014-07-10 01:22:14 +02:00

pngdsp_init.c

…

pngdsp.asm

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

proresdsp_init.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02: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

qpeldsp_init.c

avcodec/x86/qpeldsp_init: Restore author attribution

2014-05-30 04:05:29 +02:00

qpeldsp.asm

Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'

2014-05-30 02:43:34 +02: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

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

rv40dsp_init.c

avcodec/x86/rv40dsp_init: fix () in macros

2014-06-20 21:36:43 +02:00

rv40dsp.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

sbrdsp_init.c

x86: sbrdsp: implement SSE qmf_deint_neg

2014-05-15 23:11:18 +02:00

sbrdsp.asm

x86: sbrdsp: implement SSE qmf_deint_neg

2014-05-15 23:11:18 +02:00

simple_idct.c

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

2014-07-01 15:22:11 +02:00

snowdsp.c

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00

svq1enc_init.c

x86/svq1enc: port ssd_int8_vs_int16 to yasm

2014-07-05 21:43:40 +02:00

svq1enc.asm

x86/svq1enc: use unaligned mov on SSE2

2014-07-06 20:27:57 +02: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

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

vc1dsp_init.c

vc1dsp: fix build without inline asm

2014-04-22 14:01:53 +02:00

vc1dsp_mmx.c

x86: kill fpel_mmx.c

2014-05-21 03:25:08 +02:00

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

Revert "x86/videodsp: add emulated_edge_mc_mmxext"

2014-06-28 05:39:07 +02:00

videodsp.asm

Revert "x86/videodsp: add emulated_edge_mc_mmxext"

2014-06-28 05:39:07 +02:00

vorbisdsp_init.c

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

vorbisdsp.asm

…

vp3dsp_init.c

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00

vp3dsp.asm

…

vp6dsp_init.c

Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'

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

vp6dsp.asm

Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'

2013-08-24 11:04:11 +02:00

vp8dsp_init.c

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

vp8dsp_loopfilter.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

vp8dsp.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

vp9dsp_init.c

x86/vp9: inital AVX2 intra_pred

2014-06-08 02:37:20 +02:00

vp9intrapred.asm

Merge commit '79793f833784121d574454af4871866576c0749d'

2014-07-01 15:43:40 +02:00

vp9itxfm.asm

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

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

vp9lpf.asm

avcodec/x86/vp9lpf: add a comment above a bunch of SWAP.

2014-04-20 21:33:58 +02:00

vp9mc.asm

x86/vp9mc: add vp9 namespace.

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

vp56_arith.h

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00

w64xmmtest.c

x86: Add an xmm clobbering wrapper for avcodec_encode_video2

2013-09-17 10:53:23 +02:00