[FFmpeg-cvslog] Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 14:56:00 2013 +0200| [2a930fa29ea2ae4d613159d3697a4c4d3c47679f] | committer: Michael Niedermayer

Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'

* commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44':
  rl2: Avoid a division by zero

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

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