[FFmpeg-cvslog] avcodec/magicyuv: make RLE table reading match reference

Paul B Mahol git at videolan.org
Mon Jul 10 13:16:57 EEST 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Jul 10 11:47:42 2017 +0200| [fa3fd7f5a003794da8969ec21688e870c03100d6] | committer: Paul B Mahol

avcodec/magicyuv: make RLE table reading match reference

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/magicyuv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c
index 5f09c0be53..93b73d403d 100644
--- a/libavcodec/magicyuv.c
+++ b/libavcodec/magicyuv.c
@@ -438,9 +438,9 @@ static int build_huffman(AVCodecContext *avctx, GetBitContext *gbit, int max)
 
     memset(s->len, 0, sizeof(s->len));
     while (get_bits_left(gbit) >= 8) {
-        int b = get_bits(gbit, 4);
-        int x = get_bits(gbit, 4);
-        int l = get_bitsz(gbit, b) + 1;
+        int b = get_bits(gbit, 1);
+        int x = get_bits(gbit, 7);
+        int l = get_bitsz(gbit, b * 8) + 1;
 
         for (k = 0; k < l; k++)
             if (j + k < max)



More information about the ffmpeg-cvslog mailing list