| 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(); |