Picture-based subs for FFmpeg Video
Vobsub fixes + filtered subtitle browsing
MediaInfo ffmpeg parser subtitle fixes
Add whitelist function
Formatting
Fix misplaced threads option
Sync
Merge branch 'whitelist' of github.com:UniversalMediaServer/UniversalMediaServer into whitelist
Add Deny file support
Imporved filter
Merge pull request #126 from skeptical/pict

Picture-based subs for FFmpeg Video
Formatting
Formatting
Merge with master
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into whitelist

Conflicts:
	src/main/java/net/pms/configuration/RendererConfiguration.java
Merge pull request #140 from UniversalMediaServer/whitelist

Add whitelist function
Updated changelog
Formatting
Support automatically muxing WEB-DL files on Linux by default
Simplified logic and updated comment