Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:13:54 +0000 (19:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:13:54 +0000 (19:13 +0200)
commitf3ae90621e03e2d91201e4f863c6d5b61555cadd
treee5df48a24b401b0fde5d1f0cd51e1d7cf932a8dc
parentc4dabc38a3a221dde64e1dddb66a7eee6ec4039f
parent277103e07fbe22fc8e4361bacd5c6b48133f3ba5
Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10

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

Conflicts:
avconv.c

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