Adjusting media_file_builder.cpp and frame_loader_context.h to FFmpeg 5.0

Javernaut · Javernaut · commit e38ba2ef96b4 · 2022-03-25T21:52:14.000+02:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ extern "C" {`
`10`	`10`	`#include <libavformat/avformat.h>`
`11`	`11`	`#include <libavcodec/avcodec.h>`
`12`	`12`	`#include <libavutil/bprint.h>`
	`13`	`+#include <libavutil/channel_layout.h>`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`static jstring toJString(const char *cString) {`