1From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 2From: Jason Wessel <jason.wessel@windriver.com> 3Date: Wed, 9 May 2018 13:33:59 -0700 4Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function 5 compile failure until next uprev 6 7Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 8 9--- 10 modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ 11 1 file changed, 8 insertions(+) 12 13diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp 14index 6dca724a89..ae55dd4555 100644 15--- a/modules/videoio/src/cap_ffmpeg_impl.hpp 16+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp 17@@ -774,6 +774,14 @@ struct ImplMutex::Impl 18 19 #endif 20 21+/* NOTE This is deprecated in ffmpeg and the code should be removed */ 22+#ifndef AVFMT_RAWPICTURE 23+#define AVFMT_RAWPICTURE 0x0020 24+#endif /* AVFMT_RAWPICTURE */ 25+#ifndef CODEC_FLAG_GLOBAL_HEADER 26+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER 27+#endif 28+ 29 void ImplMutex::init() 30 { 31 impl = new Impl(); 32