Merge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'
authorClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:23:07 +0000 (11:23 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:23:07 +0000 (11:23 +0200)
* commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec':
  swscale-test: const correctness for pointer variable

This commit is a noop, see b36745339df026264007b6baaee50584a8a95c22

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

Trivial merge