diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-07-06 22:31:33 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-07-07 03:47:29 +0200 |
| commit | 83c0f7b046d0efbfa4ac08b51e3c1500071a857f (patch) | |
| tree | 6d3acb91f4d9ea2bb1e69d6e5ec2c5c23bcfe40b /libavformat | |
| parent | 79f41a0760780d997ef02e56cec0db72303bed0a (diff) | |
| download | ffmpeg-83c0f7b046d0efbfa4ac08b51e3c1500071a857f.tar.gz | |
avformat/evcdec: Avoid nonsense casts
For uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE], &buf still points
to the beginning of buf, but it is of type "pointer to array of
EVC_NALU_LENGTH_PREFIX_SIZE uint8_t" (i.e. pointer arithmetic
would operate on blocks of size EVC_NALU_LENGTH_PREFIX_SIZE).
This is of course a different type than uint8_t*, which is why
there have been casts in evc_read_packet(). But these are unnecessary
if one justs removes the unnecessary address-of operator.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/evcdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c index 73aab6c52f..9e09f8d264 100644 --- a/libavformat/evcdec.c +++ b/libavformat/evcdec.c @@ -65,7 +65,7 @@ static int annexb_probe(const AVProbeData *p) int nalu_type; size_t nalu_size; int got_sps = 0, got_pps = 0, got_idr = 0, got_nonidr = 0; - unsigned char *bits = (unsigned char *)p->buf; + const unsigned char *bits = p->buf; int bytes_to_read = p->buf_size; while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { @@ -159,11 +159,11 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; - ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + ret = avio_read(s->pb, buf, EVC_NALU_LENGTH_PREFIX_SIZE); if (ret < 0) return ret; - nalu_size = evc_read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + nalu_size = evc_read_nal_unit_length(buf, EVC_NALU_LENGTH_PREFIX_SIZE); if (!nalu_size || nalu_size > INT_MAX) return AVERROR_INVALIDDATA; |