RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/evcdec: remove unnecessary av_packet_unref() calls 

And return proper error codes.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-06-19 23:35:37 -03:00
parent 2276bcc52a
commit 43ace56c7e
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/evcdec.c
View File

@ -186,11 +186,8 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt)
EVCDemuxContext *const c = s->priv_data; EVCDemuxContext *const c = s->priv_data;
int eof = avio_feof (s->pb); if (avio_feof(s->pb))
if(eof) {
av_packet_unref(pkt);
return AVERROR_EOF; return AVERROR_EOF;
}
while(!au_end_found) { while(!au_end_found) {
uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE]; uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE];
@ -200,16 +197,12 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE);
if (ret < 0) { if (ret < 0)
av_packet_unref(pkt);
return ret; return ret;
}
nalu_size = read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); nalu_size = read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE);
if(nalu_size <= 0) { if (nalu_size <= 0)
av_packet_unref(pkt); return AVERROR_INVALIDDATA;
return -1;
}
avio_seek(s->pb, -EVC_NALU_LENGTH_PREFIX_SIZE, SEEK_CUR); avio_seek(s->pb, -EVC_NALU_LENGTH_PREFIX_SIZE, SEEK_CUR);
@ -217,7 +210,7 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret != (nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE)) if (ret != (nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE))
return AVERROR(EIO); return AVERROR_INVALIDDATA;
ret = av_bsf_send_packet(c->bsf, pkt); ret = av_bsf_send_packet(c->bsf, pkt);
if (ret < 0) { if (ret < 0) {