Index: gz-common-ignition-common3_3.14.2/graphics/src/Image.cc
===================================================================
--- gz-common-ignition-common3_3.14.2.orig/graphics/src/Image.cc
+++ gz-common-ignition-common3_3.14.2/graphics/src/Image.cc
@@ -20,6 +20,7 @@
 #include <FreeImage.h>
 
 #include <string>
+#include <cstring>
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Util.hh>
Index: gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
===================================================================
--- gz-common-ignition-common3_3.14.2.orig/av/src/AudioDecoder.cc
+++ gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
@@ -157,7 +157,11 @@ bool AudioDecoder::Decode(uint8_t **_out
         // decodedFrame->linesize[0].
         int size = decodedFrame->nb_samples *
           av_get_bytes_per_sample(this->data->codecCtx->sample_fmt) *
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,24,100)
           this->data->codecCtx->ch_layout.nb_channels;
+#else
+          this->data->codecCtx->channels;
+#endif
         // Resize the audio buffer as necessary
         if (*_outBufferSize + size > maxBufferSize)
         {