Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

* commit '963f76144897d3f7684d82ec21e51dd50ea1106e': avresample: Make sure the even check does not overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 85cf049d50
parent 9bcc430481 963f761448
commit 85cf049d50
1 changed files with 1 additions and 1 deletions
--- a/libavresample/audio_mix_matrix.c
+++ b/libavresample/audio_mix_matrix.c
@ -60,7 +60,7 @@

 static av_always_inline int even(uint64_t layout)
 {
-    return (!layout || (layout & (layout - 1)));
+    return (!layout || !!(layout & (layout - 1)));
 }

 static int sane_layout(uint64_t layout)