Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 1 | From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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> |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 8 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 9 | --- |
| 10 | modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ |
| 11 | 1 file changed, 8 insertions(+) |
| 12 | |
| 13 | diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp |
Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 14 | index 6dca724a89..ae55dd4555 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 15 | --- a/modules/videoio/src/cap_ffmpeg_impl.hpp |
| 16 | +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp |
Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 17 | @@ -774,6 +774,14 @@ struct ImplMutex::Impl |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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(); |