Merge pull request #3683 from beedaddy/master

Fix: Really do save Opus transcoding options
Improved file type detection for Ogg/Opus