Remove further 1sample=2byte assumptions within FFmpeg to allow