diff options
| author | wm4 <wm4@nowhere> | 2015-05-05 21:47:36 +0200 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-07 10:50:59 +0900 |
| commit | 71a88d75ffb9112f63899e2ed218c5c0d50adf72 (patch) | |
| tree | cd5908ed888e90f37d490c36713110f86a5bb9e6 | |
| parent | 938008fff17b04087324f865f3e2df399d7432ec (diff) | |
| download | mpv-71a88d75ffb9112f63899e2ed218c5c0d50adf72.tar.bz2 mpv-71a88d75ffb9112f63899e2ed218c5c0d50adf72.tar.xz | |
audio: minor cosmetics
These ( ) were probably not removed when the format constants were
changed from defines to an enum.
(cherry picked from commit d76f9a484ea7795655637eb0ddc8655aa4fff345)
| -rw-r--r-- | audio/format.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/audio/format.h b/audio/format.h index 605875e03f..c4e269f2f5 100644 --- a/audio/format.h +++ b/audio/format.h @@ -64,24 +64,24 @@ enum af_format { AF_FORMAT_UNKNOWN = 0, - AF_FORMAT_U8 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_8BIT), - AF_FORMAT_S8 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_8BIT), - AF_FORMAT_U16 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT), - AF_FORMAT_S16 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT), - AF_FORMAT_U24 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT), - AF_FORMAT_S24 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT), - AF_FORMAT_U32 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT), - AF_FORMAT_S32 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT), - - AF_FORMAT_FLOAT = (AF_FORMAT_F|AF_FORMAT_32BIT), - AF_FORMAT_DOUBLE = (AF_FORMAT_F|AF_FORMAT_64BIT), + AF_FORMAT_U8 = AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_8BIT, + AF_FORMAT_S8 = AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_8BIT, + AF_FORMAT_U16 = AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT, + AF_FORMAT_S16 = AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT, + AF_FORMAT_U24 = AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT, + AF_FORMAT_S24 = AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT, + AF_FORMAT_U32 = AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT, + AF_FORMAT_S32 = AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT, + + AF_FORMAT_FLOAT = AF_FORMAT_F|AF_FORMAT_32BIT, + AF_FORMAT_DOUBLE = AF_FORMAT_F|AF_FORMAT_64BIT, // Planar variants - AF_FORMAT_U8P = (AF_INTP|AF_FORMAT_US|AF_FORMAT_8BIT), - AF_FORMAT_S16P = (AF_INTP|AF_FORMAT_SI|AF_FORMAT_16BIT), - AF_FORMAT_S32P = (AF_INTP|AF_FORMAT_SI|AF_FORMAT_32BIT), - AF_FORMAT_FLOATP = (AF_FLTP|AF_FORMAT_32BIT), - AF_FORMAT_DOUBLEP = (AF_FLTP|AF_FORMAT_64BIT), + AF_FORMAT_U8P = AF_INTP|AF_FORMAT_US|AF_FORMAT_8BIT, + AF_FORMAT_S16P = AF_INTP|AF_FORMAT_SI|AF_FORMAT_16BIT, + AF_FORMAT_S32P = AF_INTP|AF_FORMAT_SI|AF_FORMAT_32BIT, + AF_FORMAT_FLOATP = AF_FLTP|AF_FORMAT_32BIT, + AF_FORMAT_DOUBLEP = AF_FLTP|AF_FORMAT_64BIT, // All of these use IEC61937 framing, and otherwise pretend to be like PCM. AF_FORMAT_S_AAC = AF_FORMAT_S_(0), |