avformat/utils: use av_packet_make_refcounted to ensure packets are ref counted
authorJames Almer <jamrial@gmail.com>
Sun, 25 Mar 2018 01:33:32 +0000 (22:33 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 2 Apr 2018 03:37:51 +0000 (00:37 -0300)
Simplifies code, while also fixing a potential leak of side data in pkt.

Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/utils.c

index f13c820..39a36a5 100644 (file)
@@ -867,13 +867,9 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
             continue;
         }
 
-        if (!pkt->buf) {
-            AVPacket tmp = { 0 };
-            err = av_packet_ref(&tmp, pkt);
-            if (err < 0)
-                return err;
-            *pkt = tmp;
-        }
+        err = av_packet_make_refcounted(pkt);
+        if (err < 0)
+            return err;
 
         if ((s->flags & AVFMT_FLAG_DISCARD_CORRUPT) &&
             (pkt->flags & AV_PKT_FLAG_CORRUPT)) {