diff options
| author | wm4 <wm4@nowhere> | 2015-05-07 23:07:14 +0200 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-09 21:13:21 +0900 |
| commit | 1127bb41c2aa4bf60be960ab80fd163bc7011bdb (patch) | |
| tree | fdec35d47467d4d1f9fa43b727ba96628e0b1c3c /audio/chmap.h | |
| parent | f58646c85c481ea51d74832cb10e5e766e9b4ca9 (diff) | |
| download | mpv-1127bb41c2aa4bf60be960ab80fd163bc7011bdb.tar.bz2 mpv-1127bb41c2aa4bf60be960ab80fd163bc7011bdb.tar.xz | |
audio: define only a single NA speaker ID
Remove the requirement from mp_chmap that speaker entries must be
unique. Use this to get rid of all the redundant NA speaker IDs.
(cherry picked from commit b91b4944bd7ddf6fef4c4254d457117017292c0a)
Diffstat (limited to 'audio/chmap.h')
| -rw-r--r-- | audio/chmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/chmap.h b/audio/chmap.h index 7165375e46..5fbc491dd8 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -62,9 +62,9 @@ enum mp_speaker_id { MP_SPEAKER_ID_UNKNOWN_LAST = MP_SPEAKER_ID_UNKNOWN0 + MP_NUM_CHANNELS - 1, // "Silent" channels. These are sometimes used to insert padding for - // unused channels. - MP_SPEAKER_ID_NA0, - MP_SPEAKER_ID_NA_LAST = MP_SPEAKER_ID_NA0 + MP_NUM_CHANNELS - 1, + // unused channels. Unlike other speaker types, multiple of these can + // occur in a single mp_chmap. + MP_SPEAKER_ID_NA, // Including the unassigned IDs in between. This is not a valid ID anymore, // but is still within uint8_t. |