From a257bc45edccc9844b78e0a84d956976ab5a203e Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Tue, 28 Jun 2022 23:33:19 +0300 Subject: [PATCH] debian/patches: new FFmpeg-5.0-compatibility.patch Closes: #1004821 --- debian/patches/FFmpeg-5.0-compatibility.patch | 46 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 debian/patches/FFmpeg-5.0-compatibility.patch diff --git a/debian/patches/FFmpeg-5.0-compatibility.patch b/debian/patches/FFmpeg-5.0-compatibility.patch new file mode 100644 index 0000000..10ce8c5 --- /dev/null +++ b/debian/patches/FFmpeg-5.0-compatibility.patch @@ -0,0 +1,46 @@ +Description: Fix build against FFmpeg 5.0 +Author: Nicholas Guriev +Bug-Debian: https://bugs.debian.org/1004821 +Last-Update: Tue, 28 Jun 2022 23:33:19 +0300 + +--- a/examples/am7xxx-play.c ++++ b/examples/am7xxx-play.c +@@ -29,6 +29,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -49,17 +50,19 @@ static int video_input_init(struct video + const char *input_path, + AVDictionary **input_options) + { +- AVInputFormat *input_format = NULL; ++ AVInputFormat const *input_format = NULL; + AVFormatContext *input_format_ctx; + AVCodecParameters *input_codec_params; + AVCodecContext *input_codec_ctx; +- AVCodec *input_codec; ++ AVCodec const *input_codec; + int video_index; + int ret; + + avdevice_register_all(); ++#if LIBAVCODEC_VERSION_MAJOR < 59 + avcodec_register_all(); + av_register_all(); ++#endif + + if (input_format_string) { + /* find the desired input format */ +@@ -158,7 +161,7 @@ static int video_output_init(struct vide + am7xxx_device *dev) + { + AVCodecContext *output_codec_ctx; +- AVCodec *output_codec; ++ AVCodec const *output_codec; + unsigned int new_output_width; + unsigned int new_output_height; + int ret; diff --git a/debian/patches/series b/debian/patches/series index f7de4aa..83c2bf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ CMakeLists.txt-use-GNUInstallDirs.patch contrib-add-AppStream-metadata.patch contrib-add-TAG-uaccess-to-udev-rules.patch doc-Doxyfile.in-set-HTML_TIMESTAMP-to-NO-to-make-the.patch +FFmpeg-5.0-compatibility.patch -- 2.1.4