Michael Niedermayer 91e00c4a78 Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0' ... * commit '458446acfa1441d283dacf9e6e545beb083b8bb0': lavc: Edge emulation with dst/src linesize Conflicts: libavcodec/cavs.c libavcodec/h264.c libavcodec/hevc.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/svq3.c libavcodec/vc1dec.c libavcodec/videodsp.h libavcodec/videodsp_template.c libavcodec/vp3.c libavcodec/vp8.c libavcodec/wmv2.c libavcodec/x86/videodsp.asm libavcodec/x86/videodsp_init.c Changes to the asm are not merged, they are left for volunteers or in their absence for later. The changes this merge introduces are reordering of the function arguments See: face578d56 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-11-15 15:07:10 +01:00
..
ac3dsp_init.c
ac3dsp.asm
cabac.h
cavsdsp.c
constants.c
constants.h
dct32.asm
dct_init.c
deinterlace.asm
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c
dsputil_init.c
dsputil_mmx.c	Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'	2013-11-15 15:07:10 +01:00
dsputil_qns_template.c
dsputil_x86.c
dsputil_x86.h
dsputil.asm
dsputilenc_mmx.c
dsputilenc.asm
dwt_yasm.asm
fdct.c
fft_init.c
fft.asm
fft.h
fmtconvert_init.c
fmtconvert.asm
fpel_mmx.c
fpel.asm
h263_loopfilter.asm
h263dsp_init.c
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
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
h264_qpel.c
h264_weight_10bit.asm
h264_weight.asm
h264chroma_init.c
h264dsp_init.c
hpeldsp_init.c
hpeldsp_mmx.c
hpeldsp_rnd_template.c
hpeldsp.asm
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
imdct36.asm
lpc.c
Makefile
mathops.h
mlpdsp.c
motion_est.c
mpeg4qpel.asm
mpegaudiodsp.c
mpegvideo.c
mpegvideoenc_template.c
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm
proresdsp_init.c
proresdsp.asm
qpel.asm
rnd_mmx.c
rnd_template.c
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct.c
snowdsp.c
v210-init.c
v210.asm
vc1dsp_init.c
vc1dsp_mmx.c
vc1dsp.asm
vc1dsp.h
videodsp_init.c	Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'	2013-11-15 15:07:10 +01:00
videodsp.asm
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
vp9dsp.asm
vp56_arith.h
w64xmmtest.c