Fix codec selection