Merge "Fix decoder mismatch with ssse3 enabled"