[FFmpeg-cvslog] hevc: Fix scaling list prediction delta for the 32x32 inter matrix

Mark Thompson git at videolan.org
Thu Jun 15 01:09:45 EEST 2017


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sun Apr 30 13:21:03 2017 +0100| [88a2e4504d1820e717730ff5f5dc0cf4d90cdd6e] | committer: Mark Thompson

hevc: Fix scaling list prediction delta for the 32x32 inter matrix

Fixes ticket #6356.

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

 libavcodec/hevc_ps.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 407190dbb1..0fa50a1508 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -725,6 +725,7 @@ static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingLi
                  * which should already be in the arrays. */
                 if (delta) {
                     // Copy from previous array.
+                    delta *= (size_id == 3) ? 3 : 1;
                     if (matrix_id < delta) {
                         av_log(avctx, AV_LOG_ERROR,
                                "Invalid delta in scaling list data: %d.\n", delta);



More information about the ffmpeg-cvslog mailing list