[FFmpeg-cvslog] Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'

Derek Buitenhuis git at videolan.org
Wed Jan 27 21:09:30 CET 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Jan 27 20:06:01 2016 +0000| [e15e108885344b5cf8520a553ad93b742a95b6d3] | committer: Derek Buitenhuis

Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e15e108885344b5cf8520a553ad93b742a95b6d3
---





More information about the ffmpeg-cvslog mailing list