1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

* commit '963f76144897d3f7684d82ec21e51dd50ea1106e':
  avresample: Make sure the even check does not overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-18 22:21:05 +02:00
commit 85cf049d50

View File

@ -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)