[FFmpeg-cvslog] opus_pvq: fix crashing on analysis of mono

Rostislav Pehlivanov git at videolan.org
Thu Nov 23 03:00:11 EET 2017


ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker at gmail.com> | Thu Nov 23 00:58:36 2017 +0000| [6e0723470bea258ceb72ee4c4916cf8f80337f92] | committer: Rostislav Pehlivanov

opus_pvq: fix crashing on analysis of mono

Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>

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

 libavcodec/opus_pvq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c
index f98b85d36f..2f7aa74da4 100644
--- a/libavcodec/opus_pvq.c
+++ b/libavcodec/opus_pvq.c
@@ -925,7 +925,8 @@ static float pvq_band_cost(CeltPVQ *pvq, CeltFrame *f, OpusRangeCoder *rc, int b
 
     for (i = 0; i < band_size; i++) {
         err_x += (X[i] - X_orig[i])*(X[i] - X_orig[i]);
-        err_y += (Y[i] - Y_orig[i])*(Y[i] - Y_orig[i]);
+        if (Y)
+            err_y += (Y[i] - Y_orig[i])*(Y[i] - Y_orig[i]);
     }
 
     dist = sqrtf(err_x) + sqrtf(err_y);



More information about the ffmpeg-cvslog mailing list