summaryrefslogtreecommitdiff
path: root/libavformat/c93.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-01-07 14:55:40 +0100
committerMarton Balint <cus@passwd.hu>2020-02-10 22:41:38 +0100
commit6a67d518d60b61ae2bd98c3948894a7be9955e8c (patch)
tree25f165390e6e0e72537007ee31edc7a03a02b789 /libavformat/c93.c
parentbbea268aa806a740e25c7dededf8dbe946e78bc5 (diff)
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>
Diffstat (limited to 'libavformat/c93.c')
-rw-r--r--libavformat/c93.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/libavformat/c93.c b/libavformat/c93.c
index 8aa80b5e0b..256b9800ca 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -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 = {