From: Michael Niedermayer Date: Tue, 25 Nov 2014 10:19:31 +0000 (+0100) Subject: Merge commit '62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f' X-Git-Tag: n2.5~179 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=bcccb2c2986bca9307b66a8d681addad54c786ff;hp=-c Merge commit '62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f' * commit '62e52b94e684491dfc5a6b7ca688bb86f7cd0f3f': vorbis_parser: Move vp check to avoid a null pointer dereference See: 374c907fb35f8236547b24d792fbb9bed201e321 Merged-by: Michael Niedermayer --- bcccb2c2986bca9307b66a8d681addad54c786ff