diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 22:21:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 22:53:23 +0200 |
| commit | 85cf049d5092cbcb8f81defeb8dcdb1f9a21ecf1 (patch) | |
| tree | 4923ed49011a1501d25f961bd43c275504008295 /libavresample | |
| parent | 9bcc430481d7d1039be03802b91b2a52fef84e5b (diff) | |
| parent | 963f76144897d3f7684d82ec21e51dd50ea1106e (diff) | |
| download | ffmpeg-85cf049d5092cbcb8f81defeb8dcdb1f9a21ecf1.tar.gz | |
Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'
* commit '963f76144897d3f7684d82ec21e51dd50ea1106e':
avresample: Make sure the even check does not overflow
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -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) |