Don't let FFmpeg defer to MEncoder if the file is being played via the transcode folder
Fixed d1bde95
Revert "Update output params when needed"

This reverts commit 3df853ef708af420a326cad38fff698dedb5a2f8.

Conflicts:
	src/main/java/net/pms/encoders/FFMpegVideo.java
	src/main/java/net/pms/encoders/FFmpegWebVideo.java
	src/main/java/net/pms/encoders/MEncoderVideo.java
	src/main/java/net/pms/encoders/VLCVideo.java
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into 5.0.0

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