Remved direct common-codec dependency