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

Merge commit '92f8e06e' 


* commit '92f8e06e':
  x86: dsputil hpeldsp: Move shared template functions into separate object

Conflicts:
	libavcodec/x86/Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents bf18810a 92f8e06e
No related branches found
No related tags 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