Merge commit '7136a0bf88f31bb8d40a3bbd251963706fb14578' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:27:34 +0000 (00:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:27:53 +0000 (00:27 +0100)
commitd208977cd1c47ddc0281186a6f0521b4b4bd6c1a
tree65348fa18e4a9c70791ab3c508f9a918d5d4fb17
parent0abd926d64a75c78e89bfc40c5398bcf45b6824b
parent7136a0bf88f31bb8d40a3bbd251963706fb14578
Merge commit '7136a0bf88f31bb8d40a3bbd251963706fb14578' into release/2.4

* commit '7136a0bf88f31bb8d40a3bbd251963706fb14578':
  vorbis: Check the vlc value in setup_classifs

Conflicts:
libavcodec/vorbisdec.c

See: ae038c0914460646503be083e30e3971093239a1
See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbisdec.c