Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'

[ffmpeg] / libavcodec / mpegaudioenc.c

diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
index 005401946eda5f312b33a836fc7d3c537932da8f..133c9dcc1df07222d9182ac7c161e844f73ea369 100644 (file)
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@ -704,6 +704,8 @@ static void encode_frame(MpegAudioContext *s,
                                     q1 = sample >> shift;
                                 q1 = (q1 * mult) >> P;
                                 q[m] = ((q1 + (1 << P)) * steps) >> (P + 1);
+                                if (q[m] < 0)
+                                    q[m] = 0;
                             }
 #endif
                             if (q[m] >= steps)