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