Merge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 10:39:17 +0000 (12:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 10:39:21 +0000 (12:39 +0200)
commit49038fc17dd09a94185c787f02479d190894e470
tree0b6a203e3393f68719e81ee4cf943df11cdeec01
parent7e63a622d14a2bc13f50ec18a0453c74ad674e44
parent41740ef8be6ec409f7eff3932ddba9a9eeec27b1
Merge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'

* commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1':
  libvpx: fix test for VPX_IMAGE_ABI_VERSION

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libvpx.c