Merge tag 'n2.1.8' of git://source.ffmpeg.org/ffmpeg into kitkat-x86

[android-x86/external-ffmpeg.git] / libavcodec / aacpsy.c

diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index d2a782e..a1183be 100644 (file)
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -727,7 +727,10 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel,
                     if (active_lines > 0.0f)
                         band->thr = calc_reduced_thr_3gpp(band, coeffs[g].min_snr, reduction);
                     pe += calc_pe_3gpp(band);
-                    band->norm_fac = band->active_lines / band->thr;
+                    if (band->thr > 0.0f)
+                        band->norm_fac = band->active_lines / band->thr;
+                    else
+                        band->norm_fac = 0.0f;
                     norm_fac += band->norm_fac;
                 }
             }