Code Cleanup

Removed some duplicate code through decomposition.
Code Cleanup

Remove duplicate boolean
Merge pull request #102 from Skylion007/master

Code Cleanup
update
Revert "Code Cleanup"

This reverts commit e460b1e4b00ca0f6198a00de59aae943d7dc7198.
Update
Merge remote-tracking branch 'UMS/master' into new_ffmpeg_subs