[FFmpeg-cvslog] avcodec/pictordec: Remove mid exit branch

Michael Niedermayer git at videolan.org
Thu Feb 23 23:20:48 EET 2023


ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Fri Nov 25 14:29:32 2022 +0100| [2953c6381afc3d52f3c97692228a5120fad4e0dd] | committer: Michael Niedermayer

avcodec/pictordec: Remove mid exit branch

This causes the RLE decoder to exit before applying the last RLE run
All images i tested with are unchanged, this makes the special case
for handling the last run unused for non truncated images.

Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 88f0e05c72f0de0cae3d9f0c5644f1965632b641)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/pictordec.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index ed0292c797..971d0a8544 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -243,8 +243,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
                         run = bytestream2_get_le16(&s->g);
                     val = bytestream2_get_byte(&s->g);
                 }
-                if (!bytestream2_get_bytes_left(&s->g))
-                    break;
 
                 if (bits_per_plane == 8) {
                     picmemset_8bpp(s, frame, val, run, &x, &y);



More information about the ffmpeg-cvslog mailing list