Added Sid's changes to build with the new codec2 changes.