Merge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 10:22:18 +0000 (12:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 10:38:40 +0000 (12:38 +0200)
commit7e63a622d14a2bc13f50ec18a0453c74ad674e44
tree16ca371bc859682a683c1051ac6602995d8170ac
parent8f454c31545459b668007ae5d94625f3a97686f8
parenta88e21f5b78ef5e75b073ecbfd4e92921002a703
Merge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703'

* commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703':
  Fix missing symbols when libvpx has only vp8 enabled

Not merged, the FFmpeg libvpx-vp8 encoder does not use anything from libvpx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>