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

Merge commit '34efb8a1' 


* commit '34efb8a1':
  quickdraw: Support direct pixel blocks

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 251f9dcf 34efb8a1
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