Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:06:01 +0000 (20:06 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:06:01 +0000 (20:06 +0000)
commite15e108885344b5cf8520a553ad93b742a95b6d3
treeb70ed8f56f846a01150ecaef8e629ad994a49f7a
parentfa6c7ccc20d3dc8f220af31f10a159e1b7a13b92
parentd43a165bda0eae95f4c7a168c7d13d94966c1a09
Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'

* commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09':
  imgconvert: Add the proper API guards to a deprecated function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/imgconvert.c
libavcodec/version.h