Fix deprecated warnings into coded data class

valnoel · valnoel · commit f96989b27b04 · 2020-02-12T17:03:47.000+01:00
diff --git a/src/AvTranscoder/data/coded/CodedData.cpp b/src/AvTranscoder/data/coded/CodedData.cpp
@@ -43,7 +43,7 @@ CodedData& CodedData::operator=(const CodedData& other)
 
 CodedData::~CodedData()
 {
-    av_free_packet(&_packet);
+    av_packet_unref(&_packet);
 }
 
 void CodedData::resize(const size_t newSize)
@@ -75,7 +75,7 @@ void CodedData::refData(CodedData& frame)
 
 void CodedData::clear()
 {
-    av_free_packet(&_packet);
+    av_packet_unref(&_packet);
     initAVPacket();
 }
 
@@ -94,7 +94,9 @@ void CodedData::initAVPacket()
 
 void CodedData::copyAVPacket(const AVPacket& avPacket)
 {
-#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)
+#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVCODEC_VERSION_MAJOR > 57
+    av_packet_ref(&_packet, &avPacket);
+#elif AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)
     // Need const_cast<AVCodec*> for libav versions from 54.56. to 55.56.
     av_copy_packet(&_packet, const_cast<AVPacket*>(&avPacket));
 #else

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ CodedData& CodedData::operator=(const CodedData& other)`
`43`	`43`
`44`	`44`	`CodedData::~CodedData()`
`45`	`45`	`{`
`46`		`- av_free_packet(&_packet);`
	`46`	`+ av_packet_unref(&_packet);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void CodedData::resize(const size_t newSize)`
`@@ -75,7 +75,7 @@ void CodedData::refData(CodedData& frame)`
`75`	`75`
`76`	`76`	`void CodedData::clear()`
`77`	`77`	`{`
`78`		`- av_free_packet(&_packet);`
	`78`	`+ av_packet_unref(&_packet);`
`79`	`79`	`initAVPacket();`
`80`	`80`	`}`
`81`	`81`
`@@ -94,7 +94,9 @@ void CodedData::initAVPacket()`
`94`	`94`
`95`	`95`	`void CodedData::copyAVPacket(const AVPacket& avPacket)`
`96`	`96`	`{`
`97`		`-#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)`
	`97`	`+#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVCODEC_VERSION_MAJOR > 57`
	`98`	`+ av_packet_ref(&_packet, &avPacket);`
	`99`	`+#elif AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)`
`98`	`100`	`// Need const_cast<AVCodec*> for libav versions from 54.56. to 55.56.`
`99`	`101`	`av_copy_packet(&_packet, const_cast<AVPacket*>(&avPacket));`
`100`	`102`	`#else`