diff --git a/media-file/src/main/cpp/frame_loader_context.h b/media-file/src/main/cpp/frame_loader_context.h
index 4dab095..75ab35c 100644
--- a/media-file/src/main/cpp/frame_loader_context.h
+++ b/media-file/src/main/cpp/frame_loader_context.h
@@ -22,7 +22,7 @@ struct FrameLoaderContext {
     // Parameters of a video stream.
     AVCodecParameters *parameters;
     // Codec of a video stream.
-    AVCodec *avVideoCodec;
+    const AVCodec *avVideoCodec;
     // And index of a video stream in the avFormatContext.
     int videoStreamIndex;
 };
diff --git a/media-file/src/main/cpp/media_file_builder.cpp b/media-file/src/main/cpp/media_file_builder.cpp
index a3c2caa..df77266 100644
--- a/media-file/src/main/cpp/media_file_builder.cpp
+++ b/media-file/src/main/cpp/media_file_builder.cpp
@@ -10,6 +10,7 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/bprint.h>
+#include <libavutil/channel_layout.h>
 }
 
 static jstring toJString(const char *cString) {