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

Merge commit '57f09608' 


* commit '57f09608':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 74fed968 57f09608
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 489 additions and 370 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