Revert "For each codec's preferred encoder, use the generic codec name."

Too much of a PITA, IMHO.

This reverts commit bdb5dd51f8767ef35864ed642b4f5eaef6f121a1.