in case ffmpeg returns a float value for time, parse it as an integer
reverted changes in makefile
FPS Metadata regex fix for FFMpeg 1.2.1
Update fluent-ffmpeg.js

Edit regex to allow "100%" as a valid value
Update calculate.js

Edit regex to allow "100%" as a valid value for the withSize function
Remove inactivity message
Fix writeToStream writing to stream after closing it

writeToStream closes the output stream when the ffmpeg process terminates, but 'data' events on the process stdout stream can still happen after that.

This patch fixes this problem by closing the stream on the stdout 'end' event.
Merge branch 'master' of github.com:dhritzkiv/node-fluent-ffmpeg into dhritzkiv/pull/176
Merge branch 'bugfix/timemark_float' of github.com:saschagehlich/node-fluent-ffmpeg into saschagehlich/pull/157

Conflicts:
	lib/extensions.js
Merge branch 'dhritzkiv/pull/176'
Merge pull request #185 from njoyard/fix-writeToStream

Fix writeToStream writing to stream after closing it
Merge pull request #184 from bencevans/patch-1

Remove inactivity message
Merge remote-tracking branch 'schaermu/master'
test case for issue #188
queue up calls to exec in Metadata Fixes #188
Test Node 0.10 & 0.8 on Travis
Merge branch 'master' into metadataTimeout
Travis: Display FFMPEG version on build
Merge pull request #189 from nickdesaulniers/metadataTimeout

Test case and fix for issue #188
Merge pull request #191 from ablankenship10/master

FPS Metadata regex fix for FFMpeg 1.2.1