har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/evcdec: Avoid nonsense casts

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2023-07-06 22:31:33 +02:00
parent 79f41a0760
commit 83c0f7b046
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/evcdec.c
View File

@ -65,7 +65,7 @@ static int annexb_probe(const AVProbeData *p)
int nalu_type; int nalu_type;
size_t nalu_size; size_t nalu_size;
int got_sps = 0, got_pps = 0, got_idr = 0, got_nonidr = 0; 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; int bytes_to_read = p->buf_size;
while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_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) if (ret < 0)
return ret; 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) if (ret < 0)
return ret; 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) if (!nalu_size || nalu_size > INT_MAX)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;