[FFmpeg-cvslog] Merge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri May 19 11:23:07 2017 +0200| [5d986609ba47b405018b1de78413a76b58de1c8b] | committer: Clément Bœsch

Merge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'

* commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec':
  swscale-test: const correctness for pointer variable

This commit is a noop, see b36745339df026264007b6baaee50584a8a95c22

Merged-by: Clément Bœsch <u at pkh.me>

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