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

Merge commit '1a8d0cf7' 


* commit '1a8d0cf7':
  x86: dsputil: Move inline assembly macros to a separate header

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 32da2fd4 1a8d0cf7
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