Michael Niedermayer 3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367' ... * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-07-17 23:27:40 +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_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
cavsdsp.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
constants.c
constants.h
dca.h
dcadsp_init.c
dcadsp.asm
dct32.asm
dct_init.c
deinterlace.asm
dirac_dwt.c	Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'	2014-07-17 22:07:52 +02:00
dirac_dwt.h
diracdsp_mmx.c	Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'	2014-07-17 22:07:52 +02:00
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc_init.c
dnxhdenc.asm
dwt_yasm.asm
fdct.c
fdctdsp_init.c	Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'	2014-07-08 03:19:06 +02:00
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	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
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
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
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	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
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
hpeldsp_rnd_template.c
hpeldsp.asm
hpeldsp.h
huffyuvdsp_init.c	Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'	2014-07-05 19:11:26 +02:00
huffyuvdsp.asm
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.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
inline_asm.h
lossless_audiodsp_init.c
lossless_audiodsp.asm
lossless_videodsp_init.c
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 '2d60444331fca1910510038dd3817bea885c2367'	2014-07-17 23:27:40 +02:00
mathops.h
me_cmp_init.c	Merge commit '2d60444331fca1910510038dd3817bea885c2367'	2014-07-17 23:27:40 +02:00
me_cmp.asm	Merge commit '2d60444331fca1910510038dd3817bea885c2367'	2014-07-17 23:27:40 +02:00
mlpdsp.c
mpegaudiodsp.c
mpegvideo.c
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
proresdsp_init.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
proresdsp.asm
qpel.asm
qpeldsp_init.c
qpeldsp.asm
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	Merge commit '79793f833784121d574454af4871866576c0749d'	2014-07-01 15:43:40 +02:00
sbrdsp_init.c
sbrdsp.asm
simple_idct.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
snowdsp.c	Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'	2014-07-17 22:07:52 +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
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	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
vp9intrapred.asm	Merge commit '79793f833784121d574454af4871866576c0749d'	2014-07-01 15:43:40 +02:00
vp9itxfm.asm
vp9lpf.asm
vp9mc.asm
vp56_arith.h
w64xmmtest.c