From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 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 6dca724a89..ae55dd4555 100644
|
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
|
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
|
@@ -774,6 +774,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();
|
