Skip to content
Snippets Groups Projects
Commit 91e00c4a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '458446ac'


* 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: face578d
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e28130bc 458446ac
No related branches found
No related tags found
No related merge requests found
Showing
with 226 additions and 172 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment