Michael Niedermayer 581b5f0b9b Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' ... * commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-07-01 15:22:11 +02:00
..
ac3dsp_init.c
ac3dsp.asm
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_mmx.c	x86/blockdsp: move asm code out of dsputil	2014-06-19 13:09:03 +02:00
blockdsp.asm	x86/blockdsp: restore author attribution	2014-06-19 18:31:44 +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
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
dcadsp_init.c
dcadsp.asm
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
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc_init.c
dnxhdenc.asm
dsputil_init.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
dsputil_mmx.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
dsputil_qns_template.c
dsputil_x86.h	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
dsputil.asm	x86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm	2014-06-23 22:11:18 +02:00
dsputilenc_mmx.c	avcodec/x86/dsputilenc_mmx: fix build without yasm	2014-06-04 05:39:03 +02:00
dsputilenc.asm	x86: dsputilenc: convert hf_noise*_mmx to yasm	2014-06-03 23:59:43 +02:00
dwt_yasm.asm
fdct.c
fft_init.c
fft.asm
fft.h
flacdsp_init.c
flacdsp.asm
fmtconvert_init.c
fmtconvert.asm
fpel.asm
fpel.h
h263_loopfilter.asm
h263dsp_init.c
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm	Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'	2014-06-10 18:35:49 +02:00
h264_i386.h
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
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
h264_weight_10bit.asm
h264_weight.asm
h264chroma_init.c
h264dsp_init.c	Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'	2014-06-26 02:58:59 +02:00
hevc_deblock.asm
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	avcodec/x86/hevc: add avx2 dc idct	2014-06-25 14:49:44 +02:00
hevcdsp.h	avcodec/x86/hevc: add avx2 dc idct	2014-06-25 14:49:44 +02:00
hpeldsp_init.c
hpeldsp_rnd_template.c
hpeldsp.asm	x86: hpeldsp: better factorization	2014-05-29 21:47:40 +02:00
hpeldsp.h
huffyuvdsp_init.c	x86/huffyuvdsp: fix some prototypes	2014-05-31 00:29:00 +02:00
huffyuvdsp_mmx.c	x86/huffyuvdsp: fix some prototypes	2014-05-31 00:29:00 +02:00
huffyuvdsp.asm	x86util: add and use RSHIFT/LSHIFT macros	2014-06-15 13:19:27 +02:00
huffyuvdsp.h	x86/huffyuvdsp: fix some prototypes	2014-05-31 00:29:00 +02:00
huffyuvencdsp_mmx.c
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.h	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
imdct36.asm
inline_asm.h
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
Makefile	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
mathops.h
mlpdsp.c
motion_est.c	x86/motion_est: sad_{x, y}2_mmxext functions are bitexact	2014-06-04 00:48:35 +02:00
mpegaudiodsp.c
mpegvideo.c
mpegvideodsp.c	Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'	2014-06-23 21:10:10 +02:00
mpegvideoenc_template.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm
proresdsp_init.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
proresdsp.asm
qpel.asm
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
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c	avcodec/x86/rv40dsp_init: fix () in macros	2014-06-20 21:36:43 +02:00
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
snowdsp.c
svq1enc_mmx.c	avcodec/x86/svq1enc_mmx: Add author attribution	2014-05-30 00:30:05 +02:00
ttadsp_init.c
ttadsp.asm
v210-init.c
v210.asm
vc1dsp_init.c
vc1dsp_mmx.c
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
vorbisdsp.asm
vp3dsp_init.c
vp3dsp.asm
vp6dsp_init.c
vp6dsp.asm
vp8dsp_init.c
vp8dsp_loopfilter.asm
vp8dsp.asm
vp9dsp_init.c	x86/vp9: inital AVX2 intra_pred	2014-06-08 02:37:20 +02:00
vp9intrapred.asm	vp9/x86: fix overwrite in ipred_vl_4x4_ssse3.	2014-06-12 04:11:20 +02:00
vp9itxfm.asm
vp9lpf.asm
vp9mc.asm
vp56_arith.h
w64xmmtest.c