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

Merge commit '11079673' 


* commit '11079673':
  x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

Conflicts:
	libavcodec/x86/Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a6e78243 11079673
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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