avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
44841528 · Michael Niedermayer · 9d66aa2c · 44841528
Commit 44841528 authored Apr 09, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

mpegaudioenc_template.c libavcodec/mpegaudioenc_template.c +4 -3

No files found.
--- a/libavcodec/mpegaudioenc_template.c
+++ b/libavcodec/mpegaudioenc_template.c
@@ -700,9 +700,10 @@ static void encode_frame(MpegAudioContext *s,
                                else
                                    q1 = sample >> shift;
                                q1 = (q1 * mult) >> P;
-                                q[m] = ((q1 + (1 << P)) * steps) >> (P + 1);
-                                if (q[m] < 0)
-                                    q[m] = 0;
+                                q1 += 1 << P;
+                                if (q1 < 0)
+                                    q1 = 0;
+                                q[m] = (unsigned)(q1 * steps) >> (P + 1);
                            }
 #endif
                            if (q[m] >= steps)