diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 21:49:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 01:02:06 +0200 |
commit | 560612344edf8f44c4528b2c13801f8c25c5a059 (patch) | |
tree | cb1297173edde548152a1398f567ce4da29e3f1e | |
parent | 8088d6f5f11b9f9188555f4642c940ddc92271a6 (diff) | |
download | ffmpeg-560612344edf8f44c4528b2c13801f8c25c5a059.tar.gz |
avcodec/pictordec: remove y checks, which have become redundant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/pictordec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index a6ecd99d62..0bf4fcd552 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -201,7 +201,7 @@ static int decode_frame(AVCodecContext *avctx, if (bytestream2_get_le16(&s->g)) { x = 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; t1 = bytestream2_get_bytes_left(&s->g); @@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_skip(&s->g, 2); 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) { int run = 1; val = bytestream2_get_byte(&s->g); @@ -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; if (bits_per_plane == 8) picmemset_8bpp(s, frame, val, run, &x, &y); |