Commit 56061234 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/pictordec: remove y checks, which have become redundant

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8088d6f5
...@@ -201,7 +201,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -201,7 +201,7 @@ static int decode_frame(AVCodecContext *avctx,
if (bytestream2_get_le16(&s->g)) { if (bytestream2_get_le16(&s->g)) {
x = 0; x = 0;
plane = 0; plane = 0;
while (y >= 0 && bytestream2_get_bytes_left(&s->g) >= 6) { while (bytestream2_get_bytes_left(&s->g) >= 6) {
int stop_size, marker, t1, t2; int stop_size, marker, t1, t2;
t1 = bytestream2_get_bytes_left(&s->g); t1 = bytestream2_get_bytes_left(&s->g);
...@@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx,
bytestream2_skip(&s->g, 2); bytestream2_skip(&s->g, 2);
marker = bytestream2_get_byte(&s->g); marker = bytestream2_get_byte(&s->g);
while (plane < s->nb_planes && y >= 0 && while (plane < s->nb_planes &&
bytestream2_get_bytes_left(&s->g) > stop_size) { bytestream2_get_bytes_left(&s->g) > stop_size) {
int run = 1; int run = 1;
val = bytestream2_get_byte(&s->g); val = bytestream2_get_byte(&s->g);
...@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx,
} }
} }
if (x < avctx->width && y >= 0) { if (x < avctx->width) {
int run = (y + 1) * avctx->width - x; int run = (y + 1) * avctx->width - x;
if (bits_per_plane == 8) if (bits_per_plane == 8)
picmemset_8bpp(s, frame, val, run, &x, &y); picmemset_8bpp(s, frame, val, run, &x, &y);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment