Merge "CCodec: output format duplicated at CCodecConfig" am: 26a5773f3b

Change-Id: I5bd5b3b76f66ad3f21dda1b0f39517818a5a1216