[FFmpeg-cvslog] Merge commit '4ab496261b12e20ef293b7adca4fcaef1a67c538'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Mar 19 17:24:32 2017 -0300| [54b19aaaeb3c908311605eb862d636315325dff1] | committer: James Almer

Merge commit '4ab496261b12e20ef293b7adca4fcaef1a67c538'

* commit '4ab496261b12e20ef293b7adca4fcaef1a67c538':
  libvpx: Cast a pointer to const to squelch a warning

This commit is a noop, see 09b3bbe6057c9d03dff2467b1e6748a617afea15

Merged-by: James Almer <jamrial at gmail.com>

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