ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines)