summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-07 23:26:33 +0200
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-05-08 16:38:46 +0900
commit0f834d0d5abf4eed7548281e67843747f056b08f (patch)
tree2e3ce8d5cc26090edee2aad735a187c3fda37fe2
parent375437f204e8ed670c49158c73f8ae8e1bb096e6 (diff)
downloadmpv-0f834d0d5abf4eed7548281e67843747f056b08f.tar.bz2
mpv-0f834d0d5abf4eed7548281e67843747f056b08f.tar.xz
audio: fix messed up assert()
This made no sense and always evaluated to true. (cherry picked from commit 7b09654c33ca81aede475235121ebc938791dc80)
-rw-r--r--audio/chmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/chmap.c b/audio/chmap.c
index 7e62dab74a..1c40c66b0f 100644
--- a/audio/chmap.c
+++ b/audio/chmap.c
@@ -397,7 +397,7 @@ void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from,
}
for (int n = 0; n < to->num; n++)
- assert(to->speaker[n] == src[n] < 0 ? -1 : from->speaker[src[n]]);
+ assert(src[n] < 0 || (to->speaker[n] == from->speaker[src[n]]));
}
// Performs the difference between a and b, and store it in diff. If b has