Merge "codec2: small error handling fix in avcenc"