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

Merge commit '652f5185' 


* commit '652f5185':
  x86: mmx2 ---> mmxext in comments and messages

Conflicts:
	libswscale/x86/swscale_template.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9766d9c9 652f5185
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 24 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