Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

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

Conflicts:
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-07 20:52:40 +02:00
4 changed files with 4 additions and 9 deletions

View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h
sws_getCachedContext is not going to be removed in the future.
2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h
reordered_opaque is not going to be removed in the future.