Merge commit '62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:19:31 +0000 (11:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:20:27 +0000 (11:20 +0100)
commitbcccb2c2986bca9307b66a8d681addad54c786ff
treec3b8d2c3efa8525e55bdcb28d2731476abfd4720
parenta63ec9d5737a79ea78e781f90405e5bef4326468
parent62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f
Merge commit '62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f'

* commit '62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f':
  vorbis_parser: Move vp check to avoid a null pointer dereference

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