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

Conflicts:
	libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>