Merge "Fixing c++ compiler errors in svc_encodeframe.c."