Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:34:13 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:34:13 +0000 (20:34 +0200)
commit9dc112e277fd67e05044b34ce9fb3177905f2db5
treef366d0692e1e38475cee0dcb261090b209c8d325
parent75ff0e8c50d12c40170a21479ac07f573952cdf2
parentb20a8ad619ac0e2631391b6311cc000de85d22bf
Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2

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

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