Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 10:02:18 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 10:02:18 +0000 (12:02 +0200)
commitc5e11e897a9db005e93acffe1673aa8a25d18095
tree96cceabf77f5e918b175bbaea5acdfc255b91fb1
parented113d7a6b2d1ff414c1127f955119643e915812
parentdb347280eb3746d7b70888db97f1efe5f06f5624
Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'

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

Conflicts:
libavcodec/vorbisdec.c

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