Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:52:40 +0000 (20:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:52:40 +0000 (20:52 +0200)
commit4917fecf4a005918d4f32b95683f392f0fae0b51
treeab2c05a687113f409b7c655fa7b9670d37b8d1eb
parenta561662fb7223cb98907744e03398848a0d362e1
parentbb789016d423d2cfacd2904ac66257bdf7f0964e
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

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

Conflicts:
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libswscale/swscale.h
libswscale/utils.c
libswscale/version.h