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
Thumbs as resource in Barvia
Thumb as resource in Barvia
Thumbs as resource in Barvia
Thumbs as resource in Barvia
Thumbs as resource in Bravia
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