- fix ffmpeg 4.4 warnings

dgcor · May 17, 2021 · ac5f7ec · ac5f7ec
1 parent 0c7abe4
commit ac5f7ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/sfeMovie/Demuxer.cpp b/src/sfeMovie/Demuxer.cpp
@@ -353,19 +353,13 @@ namespace sfe
 	{
 		sf::Lock l(m_synchronized);
 
-		AVPacket *pkt = nullptr;
-		int err = 0;
-
-		pkt = (AVPacket *)av_malloc(sizeof(*pkt));
+		AVPacket* pkt = av_packet_alloc();
 		if (pkt == nullptr)
 		{
 			return nullptr;
 		}
-		av_init_packet(pkt);
 
-		err = av_read_frame(m_formatCtx, pkt);
-
-		if (err < 0)
+		if (av_read_frame(m_formatCtx, pkt) < 0)
 		{
 			av_packet_unref(pkt);
 			av_free(pkt);

diff --git a/src/sfeMovie/Stream.cpp b/src/sfeMovie/Stream.cpp
@@ -144,11 +144,7 @@ namespace sfe
 		{
 			if (m_codecCtx->codec->capabilities & AV_CODEC_CAP_DELAY)
 			{
-				AVPacket* flushPacket = (AVPacket*)av_malloc(sizeof(*flushPacket));
-				av_init_packet(flushPacket);
-				flushPacket->data = nullptr;
-				flushPacket->size = 0;
-				result = flushPacket;
+				result = av_packet_alloc();
 			}
 		}