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

Merge commit '8199bb7b' 


* commit '8199bb7b':
  dsputil.h: Clean up comments

Conflicts:
	libavcodec/dsputil.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ea2bd139 8199bb7b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 39 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