diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-12 19:58:16 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-13 00:36:57 +0200 |
| commit | cc0a4fa6304ce0f608a058dc80e3e1f5d7bcfe6a (patch) | |
| tree | a899834a88862832f6dbe1d330fa8e1a76a9a1f5 /libavcodec/vbndec.c | |
| parent | 300dd79c3d764a5d38b914bb0f36ba195422068e (diff) | |
avcodec/vbn(dec|enc): Avoid always-false checks
Do this by switching to bytestream2_(get|put)_le32u() from
bytestream2_(get|put)_le32(); it has after all already been checked
that the packet contains at least a full header, making all
the implicit checks in bytestream2_(get|put)_le32() dead code.
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/vbndec.c')
| -rw-r--r-- | libavcodec/vbndec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c index 56bfb1d544..a6046c766a 100644 --- a/libavcodec/vbndec.c +++ b/libavcodec/vbndec.c @@ -71,20 +71,20 @@ static int vbn_decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - if (bytestream2_get_le32(gb) != VBN_MAGIC || - bytestream2_get_le32(gb) != VBN_MAJOR || - bytestream2_get_le32(gb) != VBN_MINOR) { + if (bytestream2_get_le32u(gb) != VBN_MAGIC || + bytestream2_get_le32u(gb) != VBN_MAJOR || + bytestream2_get_le32u(gb) != VBN_MINOR) { av_log(avctx, AV_LOG_ERROR, "Invalid VBN header\n"); return AVERROR_INVALIDDATA; } - width = bytestream2_get_le32(gb); - height = bytestream2_get_le32(gb); - components = bytestream2_get_le32(gb); - format = bytestream2_get_le32(gb); - pix_fmt = bytestream2_get_le32(gb); - bytestream2_get_le32(gb); // mipmaps - data_size = bytestream2_get_le32(gb); + width = bytestream2_get_le32u(gb); + height = bytestream2_get_le32u(gb); + components = bytestream2_get_le32u(gb); + format = bytestream2_get_le32u(gb); + pix_fmt = bytestream2_get_le32u(gb); + bytestream2_get_le32u(gb); // mipmaps + data_size = bytestream2_get_le32u(gb); bytestream2_seek(gb, VBN_HEADER_SIZE, SEEK_SET); compression = format & 0xffffff00; |