[FFmpeg-cvslog] avresample: Make sure the even check does not overflow

Luca Barbato git at videolan.org
Sun Jan 18 01:01:02 CET 2015


ffmpeg | branch: release/2.4 | Luca Barbato <lu_zero at gentoo.org> | Wed Oct 15 17:32:57 2014 +0100| [c246b0b4c3a3b02a714e99423cf23d59f8f81409] | committer: Vittorio Giovara

avresample: Make sure the even check does not overflow

CC: libav-stable at libav.org
Bug-Id: CID 732225

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c246b0b4c3a3b02a714e99423cf23d59f8f81409
---

 libavresample/audio_mix_matrix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c
index 487869b..5182ae1 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)



More information about the ffmpeg-cvslog mailing list