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)
commit23eed00925c1dfacfe88d635ff5077d691f503f8
tree4b312060bcdb556f79c2b72afe5a1c04219de61f
parent1f3a577353ed684ca1d91a86dea62ed7bb334c87
parenteae0879d961b78717dd2a0899809ad22819ae9e3
Merge commit 'eae0879d961b78717dd2a0899809ad22819ae9e3'

* commit 'eae0879d961b78717dd2a0899809ad22819ae9e3':
  mp3dec: Fix VBR bit rate parsing

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