diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-01-07 14:55:40 +0100 |
---|---|---|
committer | Marton Balint <cus@passwd.hu> | 2020-02-10 22:41:38 +0100 |
commit | 6a67d518d60b61ae2bd98c3948894a7be9955e8c (patch) | |
tree | 25f165390e6e0e72537007ee31edc7a03a02b789 /libavformat/aacdec.c | |
parent | bbea268aa806a740e25c7dededf8dbe946e78bc5 (diff) | |
download | ffmpeg-6a67d518d60b61ae2bd98c3948894a7be9955e8c.tar.gz |
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/aacdec.c')
-rw-r--r-- | libavformat/aacdec.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 00ca2319ca..ba3f5ccc6d 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -141,7 +141,6 @@ static int handle_id3(AVFormatContext *s, AVPacket *pkt) ret = av_append_packet(s->pb, pkt, ff_id3v2_tag_len(pkt->data) - pkt->size); if (ret < 0) { - av_packet_unref(pkt); return ret; } @@ -174,7 +173,6 @@ retry: return ret; if (ret < ADTS_HEADER_SIZE) { - av_packet_unref(pkt); return AVERROR(EIO); } @@ -185,7 +183,6 @@ retry: av_assert2(append > 0); ret = av_append_packet(s->pb, pkt, append); if (ret != append) { - av_packet_unref(pkt); return AVERROR(EIO); } if (!ff_id3v2_match(pkt->data, ID3v2_DEFAULT_MAGIC)) { @@ -201,13 +198,10 @@ retry: fsize = (AV_RB32(pkt->data + 3) >> 13) & 0x1FFF; if (fsize < ADTS_HEADER_SIZE) { - av_packet_unref(pkt); return AVERROR_INVALIDDATA; } ret = av_append_packet(s->pb, pkt, fsize - pkt->size); - if (ret < 0) - av_packet_unref(pkt); return ret; } |