Remove ffmpeg dll wrappers in RetroPlayer
Fix merge error and change if condition similar to others