Commit 85cf049d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '963f7614'

* commit '963f7614':
  avresample: Make sure the even check does not overflow
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9bcc4304 963f7614
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
static av_always_inline int even(uint64_t layout) 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) static int sane_layout(uint64_t layout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment