[automerger skipped] Merge "CCodec: output format duplicated at CCodecConfig" into rvc-dev am: 203ccc21c6 -s ours am: 3f2351fd6a -s ours am: b182ef58d9 -s ours am: 1b8ce699d1 -s ours
am skip reason: Change-Id Ib63d15830b876c036143de4ce5010ccf8925fbe6 with SHA-1 e4716c09f7 is in history

Change-Id: I42a019bc9b8f796a25afe2622e4b3814abbc0ee1