diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:49:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:49:47 +0100 |
| commit | adfb4661d9ab102efe831ab9e95e9c3b32461b81 (patch) | |
| tree | 4e7171b3864208aa0bfc488d9873f040b9ff3cb3 | |
| parent | b4004124432e3c51fe8ec9c13b6c3db2baaf918e (diff) | |
| parent | c246b0b4c3a3b02a714e99423cf23d59f8f81409 (diff) | |
| download | ffmpeg-adfb4661d9ab102efe831ab9e95e9c3b32461b81.tar.gz | |
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>
| -rw-r--r-- | libavresample/audio_mix_matrix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c index bcbe181a80..5d92351a0e 100644 --- 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) |