diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-15 14:04:17 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-28 01:27:51 +0200 |
| commit | be6cd7dfd122cf7cd8841fd41d02067867f25898 (patch) | |
| tree | ae660f1513b75ce74065c67855ed8a5f13fb5658 /libavcodec | |
| parent | a7e8b0f360d0a7c84604e38759b24fa54e3349c7 (diff) | |
| download | ffmpeg-be6cd7dfd122cf7cd8841fd41d02067867f25898.tar.gz | |
avcodec/pgxdec: Avoid always-false checks
We have already checked that there is data to be read.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pgxdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 154a683b4f..9c474036da 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -32,9 +32,9 @@ static int pgx_get_number(AVCodecContext *avctx, GetByteContext *g, int *number) *number = 0; while (1) { uint64_t temp; - if (!bytestream2_get_bytes_left(g)) + if (bytestream2_get_bytes_left(g) <= 0) return AVERROR_INVALIDDATA; - digit = bytestream2_get_byte(g); + digit = bytestream2_get_byteu(g); if (digit == ' ' || digit == 0xA || digit == 0xD) break; else if (digit < '0' || digit > '9') @@ -59,22 +59,22 @@ static int pgx_decode_header(AVCodecContext *avctx, GetByteContext *g, if (bytestream2_get_bytes_left(g) < 12) return AVERROR_INVALIDDATA; - bytestream2_skip(g, 6); + bytestream2_skipu(g, 6); // Is the component signed? - byte = bytestream2_peek_byte(g); + byte = bytestream2_peek_byteu(g); if (byte == '+') { *sign = 0; - bytestream2_skip(g, 1); + bytestream2_skipu(g, 1); } else if (byte == '-') { *sign = 1; - bytestream2_skip(g, 1); + bytestream2_skipu(g, 1); } else if (byte == 0) goto error; - byte = bytestream2_peek_byte(g); + byte = bytestream2_peek_byteu(g); if (byte == ' ') - bytestream2_skip(g, 1); + bytestream2_skipu(g, 1); else if (byte == 0) goto error; @@ -104,9 +104,9 @@ error: for (j = 0; j < width; j++) { \ unsigned val; \ if (sign) \ - val = (PIXEL)bytestream2_get_ ##suffix(g) + (1 << (depth - 1)); \ + val = (PIXEL)bytestream2_get_ ##suffix##u(g) + (1 << (depth - 1)); \ else \ - val = bytestream2_get_ ##suffix(g); \ + val = bytestream2_get_ ##suffix##u(g); \ val <<= (D - depth); \ *(line + j) = val; \ } \ |