Revert Commit fbb659f
Correct FFmpeg padding logic
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into resume_fix

Conflicts:
	src/main/java/net/pms/encoders/MEncoderVideo.java