diff options
Diffstat (limited to 'audio/format.h')
| -rw-r--r-- | audio/format.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/audio/format.h b/audio/format.h index c4afe7a428..a14d8fe367 100644 --- a/audio/format.h +++ b/audio/format.h @@ -101,12 +101,8 @@ enum af_format { AF_FORMAT_DOUBLE_LE = (AF_FORMAT_F|AF_FORMAT_64BIT|AF_FORMAT_LE), AF_FORMAT_DOUBLE_BE = (AF_FORMAT_F|AF_FORMAT_64BIT|AF_FORMAT_BE), - AF_FORMAT_AC3_LE = (AF_FORMAT_S_AC3|AF_FORMAT_16BIT|AF_FORMAT_LE), - AF_FORMAT_AC3_BE = (AF_FORMAT_S_AC3|AF_FORMAT_16BIT|AF_FORMAT_BE), - - AF_FORMAT_IEC61937_LE = (AF_FORMAT_S_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_LE), - AF_FORMAT_IEC61937_BE = (AF_FORMAT_S_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_BE), - + AF_FORMAT_AC3 = (AF_FORMAT_S_AC3|AF_FORMAT_16BIT|AF_FORMAT_LE), + AF_FORMAT_IEC61937 = (AF_FORMAT_S_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_LE), AF_FORMAT_MPEG2 = (AF_FORMAT_S_MPEG2), // Planar variants @@ -126,13 +122,10 @@ enum af_format { AF_FORMAT_FLOAT = AF_SELECT_LE_BE(AF_FORMAT_FLOAT_LE, AF_FORMAT_FLOAT_BE), AF_FORMAT_DOUBLE = AF_SELECT_LE_BE(AF_FORMAT_DOUBLE_LE, AF_FORMAT_DOUBLE_BE), - - AF_FORMAT_AC3 = AF_SELECT_LE_BE(AF_FORMAT_AC3_LE, AF_FORMAT_AC3_BE), - AF_FORMAT_IEC61937 = AF_SELECT_LE_BE(AF_FORMAT_IEC61937_LE, AF_FORMAT_IEC61937_BE), }; #define AF_FORMAT_IS_AC3(fmt) \ - (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_S_AC3) + ((fmt) == AF_FORMAT_AC3) #define AF_FORMAT_IS_IEC61937(fmt) \ (AF_FORMAT_IS_AC3(fmt) || \ |