[FFmpeg-cvslog] Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 20 12:02:18 2013 +0200| [c5e11e897a9db005e93acffe1673aa8a25d18095] | committer: Michael Niedermayer

Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'

* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
  vorbis: fallback to normal division instead of crashing

Conflicts:
	libavcodec/vorbisdec.c

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

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