[FFmpeg-cvslog] avformat/hls: Use av_init_pkt() directly

Andreas Rheinhardt git at videolan.org
Tue Aug 18 15:14:23 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Aug 14 22:59:57 2020 +0200| [97d802914994b29eba97dc49e35e8ed60b5b8ae3] | committer: Andreas Rheinhardt

avformat/hls: Use av_init_pkt() directly

and remove reset_packet(). The packet's data pointer is already zeroed,
so the only thing that reset_packet() does that av_init_pkt() doesn't is
redundant.

Reviewed-by: Steven Liu <lingjiujianke at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavformat/hls.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 8217c5ede4..3ab07f1b3f 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -293,28 +293,18 @@ static void free_rendition_list(HLSContext *c)
     c->n_renditions = 0;
 }
 
-/*
- * Used to reset a statically allocated AVPacket to a clean state,
- * containing no data.
- */
-static void reset_packet(AVPacket *pkt)
-{
-    av_init_packet(pkt);
-    pkt->data = NULL;
-}
-
 static struct playlist *new_playlist(HLSContext *c, const char *url,
                                      const char *base)
 {
     struct playlist *pls = av_mallocz(sizeof(struct playlist));
     if (!pls)
         return NULL;
-    reset_packet(&pls->pkt);
     ff_make_absolute_url(pls->url, sizeof(pls->url), base, url);
     if (!pls->url[0]) {
         av_free(pls);
         return NULL;
     }
+    av_init_packet(&pls->pkt);
     pls->seek_timestamp = AV_NOPTS_VALUE;
 
     pls->is_id3_timestamped = -1;



More information about the ffmpeg-cvslog mailing list