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)
* commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1':
  libvpx: fix test for VPX_IMAGE_ABI_VERSION

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

Simple merge