Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 00:49:47 +01:00
commit adfb4661d9

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)