ffmpeg: some cleanup
ffmpeg: some cleanup

albertz/music-player-core,etienne-gauvin/music-player-core,etienne-gauvin/music-player-core,etienne-gauvin/music-player-core,albertz/music-player-core,albertz/music-player-core