Merge pull request #605 from azeey/4_to_5

Merge ign-common4 ➡️ gz-common5
gazebosim · May 8, 2024 · e79bc54 · e79bc54
2 parents 27ee4d6 + dc6d01c
commit e79bc54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/av/src/AudioDecoder.cc b/av/src/AudioDecoder.cc
@@ -52,7 +52,13 @@ common::AudioDecoder::Implementation::~Implementation()
 {
   // Close the codec
   if (this->codecCtx)
+  {
+#if LIBAVFORMAT_VERSION_MAJOR < 59
     avcodec_close(this->codecCtx);
+#else
+    avcodec_free_context(&this->codecCtx);
+#endif
+  }
 
   // Close the audio file
   if (this->formatCtx)

diff --git a/av/src/Video.cc b/av/src/Video.cc
@@ -114,7 +114,11 @@ void Video::Cleanup()
   avformat_close_input(&this->dataPtr->formatCtx);
 
   // Close the codec
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+  avcodec_free_context(&this->dataPtr->codecCtx);
+#else
   avcodec_close(this->dataPtr->codecCtx);
+#endif
 
   av_free(this->dataPtr->avFrameDst);
 }