[FFmpeg-cvslog] Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 20 10:58:43 2013 +0200| [fbba76e89d852c4f86ec3c498669afe037f9575a] | committer: Michael Niedermayer

Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'

* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
  vorbis: refactor vorbis_residue_decode_internal

Conflicts:
	libavcodec/vorbisdec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbba76e89d852c4f86ec3c498669afe037f9575a
---