This avoids use of preprocessor when possible, and removes a
duplicated legacy check on codec name.

Change-Id: I8f0d25cf69b51d3379f25c1a69f88c8d404c4e38