diff options
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch')
-rw-r--r-- | meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch deleted file mode 100644 index f8ccd1d55..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fe27d0e2341683606704115949d16250e4cacbfa Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Wed, 9 May 2018 13:33:59 -0700 -Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function - compile failure until next uprev - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> - ---- - modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 0d360ad..566df66 100644 ---- a/modules/videoio/src/cap_ffmpeg_impl.hpp -+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -736,6 +736,14 @@ struct ImplMutex::Impl - - #endif - -+/* NOTE This is deprecated in ffmpeg and the code should be removed */ -+#ifndef AVFMT_RAWPICTURE -+#define AVFMT_RAWPICTURE 0x0020 -+#endif /* AVFMT_RAWPICTURE */ -+#ifndef CODEC_FLAG_GLOBAL_HEADER -+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER -+#endif -+ - void ImplMutex::init() - { - impl = new Impl(); |