[FFmpeg-cvslog] avformat/mux: Remove unnecessary unreferencing of AVPacket

Andreas Rheinhardt git at videolan.org
Sat May 23 07:03:59 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat May  9 21:26:30 2020 +0200| [06fdc823371d295a6f29993e5c2e9ed7df3610d2] | committer: Andreas Rheinhardt

avformat/mux: Remove unnecessary unreferencing of AVPacket

Since commit c5324d92c5f206dcdc2cf93ae237eaa7c1ad0a40 all custom
interleave_packet() functions always return clean packets (even on
error), so that unreferencing manually can be removed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06fdc823371d295a6f29993e5c2e9ed7df3610d2
---

 libavformat/mux.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index b08d48b5fb..44d5e5d1c0 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -1067,10 +1067,7 @@ int ff_interleaved_peek(AVFormatContext *s, int stream,
 static int interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, int flush)
 {
     if (s->oformat->interleave_packet) {
-        int ret = s->oformat->interleave_packet(s, out, in, flush);
-        if (in)
-            av_packet_unref(in);
-        return ret;
+        return s->oformat->interleave_packet(s, out, in, flush);
     } else
         return ff_interleave_packet_per_dts(s, out, in, flush);
 }



More information about the ffmpeg-cvslog mailing list