| Message ID | 20221125201833.20355-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 88f0e05c72f0de0cae3d9f0c5644f1965632b641 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/pictordec: Remove mid exit branch | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Fri, Nov 25, 2022 at 09:18:33PM +0100, Michael Niedermayer wrote: > 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. > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/pictordec.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c > index 09229b94fd..27f5b96571 100644 > --- a/libavcodec/pictordec.c > +++ b/libavcodec/pictordec.c > @@ -246,8 +246,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); > -- > 2.17.1 ok -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
On Sat, Nov 26, 2022 at 10:43:34AM +1100, Peter Ross wrote: > On Fri, Nov 25, 2022 at 09:18:33PM +0100, Michael Niedermayer wrote: > > 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. > > > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/pictordec.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c > > index 09229b94fd..27f5b96571 100644 > > --- a/libavcodec/pictordec.c > > +++ b/libavcodec/pictordec.c > > @@ -246,8 +246,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); > > -- > > 2.17.1 > > ok will apply [...]
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 09229b94fd..27f5b96571 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -246,8 +246,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);
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. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/pictordec.c | 2 -- 1 file changed, 2 deletions(-)