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/oggdec.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/oggdec.c')
| -rw-r--r-- | libavformat/oggdec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index e815f42134..4f4b5fe386 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -851,7 +851,7 @@ retry: AV_PKT_DATA_SKIP_SAMPLES, 10); if(!side_data) - goto fail; + return AVERROR(ENOMEM); AV_WL32(side_data + 4, os->end_trimming); os->end_trimming = 0; } @@ -861,7 +861,7 @@ retry: AV_PKT_DATA_METADATA_UPDATE, os->new_metadata_size); if(!side_data) - goto fail; + return AVERROR(ENOMEM); memcpy(side_data, os->new_metadata, os->new_metadata_size); av_freep(&os->new_metadata); @@ -869,9 +869,6 @@ retry: } return psize; -fail: - av_packet_unref(pkt); - return AVERROR(ENOMEM); } static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index, |