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

Merge commit 'bb789016' 


* commit 'bb789016':
  swscale: Undeprecate sws_getContext()

Conflicts:
	libswscale/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a561662f bb789016
No related branches found
No related tags 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