• Michael Niedermayer's avatar
    Merge commit '458446ac' · 91e00c4a
    Michael Niedermayer authored
    * commit '458446ac':
      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: face578dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    91e00c4a
mpegvideo_enc.c 158 KB