[FFmpeg-cvslog] Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 19:13:54 2014 +0200| [f3ae90621e03e2d91201e4f863c6d5b61555cadd] | committer: Michael Niedermayer

Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10

* commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5':
  video4linux2: Avoid a floating point exception

Conflicts:
	avconv.c

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

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