Merge commit 'eae0879d961b78717dd2a0899809ad22819ae9e3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:42:32 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:42:37 +0000 (15:42 +0100)
* commit 'eae0879d961b78717dd2a0899809ad22819ae9e3':
  mp3dec: Fix VBR bit rate parsing

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

Trivial merge