Merge remote-tracking branch 'remotes/origin/MP1-4272-BUG-Update_ffmpeg_for_better_thumbnail_reliability'
Merge remote-tracking branch 'remotes/origin/MP1-2469-DetectDrive_method_obsolete'
Merge remote-tracking branch 'remotes/origin/MP1-4309-BUG-Avoid_loading_mediainfo_multiple_time_when_starting_video'

Conflicts:
	mediaportal/Core/Player/g_player.cs
Merge remote-tracking branch 'remotes/upstream/master' into 1.6.0Fork-BDJ