Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 18:09:32 +0000 (19:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 18:31:25 +0000 (19:31 +0100)
commitacfb54c076e25b5f228ab07d364738940e4171d3
tree8089459b180dcdcbb798f3446cab5db77dd83df4
parent10e3e3aa8510bdf97f2d296872b334c16009acb1
parent0025f7408a0fab2cab4a950064e4784a67463994
Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'

* commit '0025f7408a0fab2cab4a950064e4784a67463994':
  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