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

Merge commit '46bb4568' 


* commit '46bb4568':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
	libavcodec/x86/hpeldsp_avg_template.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 56ba3312 46bb4568
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 143 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