Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 08:58:43 +0000 (10:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 08:58:43 +0000 (10:58 +0200)
commitfbba76e89d852c4f86ec3c498669afe037f9575a
tree5799ca3b4c9d7f19fd1b1536c5873fa0544c3861
parentfaac955d9b7abf1c17dd76df6a8f2f3644ef5099
parent98186578a2a21af5bfe6dd71d222dc270f763c7d
Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'

* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
  vorbis: refactor vorbis_residue_decode_internal

Conflicts:
libavcodec/vorbisdec.c

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