mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-13 10:30:05 +01:00
avformat: Remove unnecessary av_packet_unref()
Since bae8844e the packet will always be unreferenced when a demuxer
returns an error, so that a lot of calls to av_packet_unref() in lots of
demuxers are now redundant and can be removed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
committed by
Marton Balint
parent
bbea268aa8
commit
6a67d518d6
@@ -158,22 +158,19 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
|
||||
ret = avio_read(pb, pkt->data + 1, datasize);
|
||||
if (ret < datasize) {
|
||||
ret = AVERROR(EIO);
|
||||
goto fail;
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
|
||||
datasize = avio_rl16(pb); /* palette size */
|
||||
if (datasize) {
|
||||
if (datasize != 768) {
|
||||
av_log(s, AV_LOG_ERROR, "invalid palette size %u\n", datasize);
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
pkt->data[0] |= C93_HAS_PALETTE;
|
||||
ret = avio_read(pb, pkt->data + pkt->size, datasize);
|
||||
if (ret < datasize) {
|
||||
ret = AVERROR(EIO);
|
||||
goto fail;
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
pkt->size += 768;
|
||||
}
|
||||
@@ -186,10 +183,6 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
pkt->data[0] |= C93_FIRST_FRAME;
|
||||
}
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
av_packet_unref(pkt);
|
||||
return ret;
|
||||
}
|
||||
|
||||
AVInputFormat ff_c93_demuxer = {
|
||||
|
||||
Reference in New Issue
Block a user