[FFmpeg-cvslog] Merge commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 14:06:51 2014 +0200| [a4de70df20f094c23d6e3a6cbf6ca85c096b0e03] | committer: Michael Niedermayer

Merge commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e' into release/1.1

* commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e':
  video4linux2: Avoid a floating point exception

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

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