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

Merge commit '71469f3b' 


* commit '71469f3b':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5747d835 71469f3b
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