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)
* commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf':
  video4linux2: Avoid a floating point exception

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

diff --cc ffmpeg_opt.c
Simple merge