Merge 4 into 5

Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · May 7, 2024 · a7dce9d · a7dce9d
2 parents 27ee4d6 + 6dba329
commit a7dce9d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/av/src/AudioDecoder.cc b/av/src/AudioDecoder.cc
@@ -64,6 +64,12 @@ AudioDecoder::AudioDecoder()
   : dataPtr(utils::MakeUniqueImpl<Implementation>())
 {
   common::load();
+  {
+#if LIBAVFORMAT_VERSION_MAJOR < 59
+#else
+    avcodec_free_context(&this->data->codecCtx);
+#endif
+  }
 }
 
 /////////////////////////////////////////////////
@@ -140,6 +146,10 @@ bool AudioDecoder::Decode(uint8_t **_outBuffer, unsigned int *_outBufferSize)
 
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
         int numChannels = this->dataPtr->codecCtx->ch_layout.nb_channels;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
+#else
+          this->data->codecCtx->channels;
+#endif
 #else
         int numChannels = this->dataPtr->codecCtx->channels;
 #endif

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);
 }