Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dcaenc.c

diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index 2b61bec98cf0cf66084e140c04e1a1ee3d7aea86..eccff08c03e8f5bcc754555a0334e0d3e7af402a 100644 (file)
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -365,8 +365,7 @@ static inline uint32_t quantize(int32_t sample, int bits)
 {
     av_assert0(sample <    1 << (bits - 1));
     av_assert0(sample >= -(1 << (bits - 1)));
-    sample &= sample & ((1 << bits) - 1);
-    return sample;
+    return sample & ((1 << bits) - 1);
 }
 
 static inline int find_scale_factor7(int64_t max_value, int bits)