Merge pull request #1266 from antonlacon/libopus-1.1.x