From 3c081dfd938181dcd0c7dfedbbc3db460d757e38 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 28 Oct 2015 23:48:56 +0100
Subject: Replace deprecated av_free_packet() calls

av_free_packet() got finally deprecated. Use av_packet_unref() instead,
which has almost the same semantics, has existed for a while, and is
available in all FFmpeg and Libav versions we support.
---
 audio/filter/af_lavcac3enc.c | 2 +-
 demux/demux_lavf.c           | 8 ++++----
 sub/sd_lavc_conv.c           | 6 +++---
 video/image_writer.c         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index 21595a656f..c1e6b964ad 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -146,7 +146,7 @@ static void uninit(struct af_instance* af)
     af_ac3enc_t *s = af->priv;
 
     if (s) {
-        av_free_packet(&s->pkt);
+        av_packet_unref(&s->pkt);
         if(s->lavc_actx) {
             avcodec_close(s->lavc_actx);
             av_free(s->lavc_actx);
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index fbe4290758..eeed7a1b9a 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -853,7 +853,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
     AVPacket *pkt = &(AVPacket){0};
     int r = av_read_frame(priv->avfc, pkt);
     if (r < 0) {
-        av_free_packet(pkt);
+        av_packet_unref(pkt);
         if (r == AVERROR(EAGAIN))
             return 1;
         if (r == AVERROR_EOF)
@@ -870,13 +870,13 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
     AVStream *st = priv->avfc->streams[pkt->stream_index];
 
     if (!demux_stream_is_selected(stream)) {
-        av_free_packet(pkt);
+        av_packet_unref(pkt);
         return 1; // don't signal EOF if skipping a packet
     }
 
     struct demux_packet *dp = new_demux_packet_from_avpacket(pkt);
     if (!dp) {
-        av_free_packet(pkt);
+        av_packet_unref(pkt);
         return 1;
     }
 
@@ -896,7 +896,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
     } else if (dp->dts != MP_NOPTS_VALUE) {
         priv->last_pts = dp->dts * AV_TIME_BASE;
     }
-    av_free_packet(pkt);
+    av_packet_unref(pkt);
 
     if (priv->format_hack.clear_filepos)
         dp->pos = -1;
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c
index 244c26e2dc..8074cd865e 100644
--- a/sub/sd_lavc_conv.c
+++ b/sub/sd_lavc_conv.c
@@ -183,7 +183,7 @@ static int parse_webvtt(AVPacket *in, AVPacket *pkt)
                                       AV_PKT_DATA_WEBVTT_IDENTIFIER,
                                       id_len);
         if (buf == NULL) {
-            av_free_packet(pkt);
+            av_packet_unref(pkt);
             return AVERROR(ENOMEM);
         }
         memcpy(buf, id, id_len);
@@ -194,7 +194,7 @@ static int parse_webvtt(AVPacket *in, AVPacket *pkt)
                                       AV_PKT_DATA_WEBVTT_SETTINGS,
                                       settings_len);
         if (buf == NULL) {
-            av_free_packet(pkt);
+            av_packet_unref(pkt);
             return AVERROR(ENOMEM);
         }
         memcpy(buf, settings, settings_len);
@@ -256,7 +256,7 @@ static void decode(struct sd *sd, struct demux_packet *packet)
 
 done:
     avsubtitle_free(&sub);
-    av_free_packet(&parsed_pkt);
+    av_packet_unref(&parsed_pkt);
 }
 
 static void reset(struct sd *sd)
diff --git a/video/image_writer.c b/video/image_writer.c
index 089afad228..6c1ed5482c 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -146,7 +146,7 @@ error_exit:
         avcodec_close(avctx);
     av_free(avctx);
     av_frame_free(&pic);
-    av_free_packet(&pkt);
+    av_packet_unref(&pkt);
     return success;
 }
 
-- 
cgit v1.2.3