Merge commit '4ab496261b12e20ef293b7adca4fcaef1a67c538'
authorJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 20:24:32 +0000 (17:24 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 20:24:32 +0000 (17:24 -0300)
commit54b19aaaeb3c908311605eb862d636315325dff1
treeca8c3596a3910242e2de501995dd026d6b45ae22
parent6966a5e4d79cc1c3bc3c8c02baf5804e24584ac0
parent4ab496261b12e20ef293b7adca4fcaef1a67c538
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@gmail.com>