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

Merge commit '71155d7b' 


* commit '71155d7b':
  dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6b2f7fd1 71155d7b
No related branches found
No related tags found
Expand all 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