[FFmpeg-cvslog] avcodec/qdrw: consume bytes when end is reached for 8bpp case

Paul B Mahol git at videolan.org
Mon Feb 27 13:06:36 EET 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Feb 27 12:04:15 2017 +0100| [3a7f8d2a1f305fac97742c6aa5528c644e08e966] | committer: Paul B Mahol

avcodec/qdrw: consume bytes when end is reached for 8bpp case

This should really be part of previous commit.

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

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

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

diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 975e440..20e673a 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -242,8 +242,9 @@ static int decode_rle(AVCodecContext *avctx, AVFrame *p, GetByteContext *gbc,
                 left  -= 2;
             } else { /* copy */
                 for (j = 0; j < code + 1; j++) {
+                    pix = bytestream2_get_byte(gbc);
                     if (pos < offset)
-                        out[pos] = bytestream2_get_byte(gbc);
+                        out[pos] = pix;
                     pos += step;
                     if (pos >= offset && step > 1) {
                         pos -= offset;



More information about the ffmpeg-cvslog mailing list