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

Merge commit 'c1661484' 


* commit 'c1661484':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 462c6cdb c1661484
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 476 additions and 346 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment