Browse Source

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>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
commit
adfb4661d9
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavresample/audio_mix_matrix.c

+ 1
- 1
libavresample/audio_mix_matrix.c 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)


Loading…
Cancel
Save