[FFmpeg-cvslog] avformat/mpeg: Remove unnecessary av_packet_unref()
Andreas Rheinhardt
git at videolan.org
Thu Mar 26 22:11:28 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 21 21:08:04 2020 +0100| [3875af84ed6f6c803aca961fc78400bcda021d44] | committer: Andreas Rheinhardt
avformat/mpeg: Remove unnecessary av_packet_unref()
Forgotten in 6a67d518.
Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3875af84ed6f6c803aca961fc78400bcda021d44
---
libavformat/mpeg.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index fad7c7fd55..eba5852266 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -961,7 +961,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) {
if (pkt->size) // raise packet even if incomplete
break;
- goto fail;
+ return ret;
}
to_read = ret & 0xffff;
new_pos = avio_tell(pb);
@@ -978,7 +978,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = av_grow_packet(pkt, to_read);
if (ret < 0)
- goto fail;
+ return ret;
n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read);
if (n < to_read)
@@ -986,10 +986,6 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
} while (total_read < psize);
return 0;
-
-fail:
- av_packet_unref(pkt);
- return ret;
}
static int vobsub_read_seek(AVFormatContext *s, int stream_index,
More information about the ffmpeg-cvslog
mailing list