| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From fd4d233757cc46cd89f68b45ec4b059940dd84ae Mon Sep 17 00:00:00 2001 |
| 2 | From: Vincent Davis Jr <vince@underview.tech> |
| 3 | Date: Fri, 9 Dec 2022 19:58:11 -0600 |
| 4 | Subject: [PATCH] codec: omxil_core.h fix multiple definition of |
| 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | |
| 8 | RPI-Distro repo forks original vlc and applies patches |
| 9 | to enable raspiberry pi support. |
| 10 | |
| 11 | Issue occurs during compilation as |
| 12 | * pf_enable_graphic_buffers |
| 13 | * pf_get_graphic_buffer_usage |
| 14 | * pf_get_hal_format |
| 15 | |
| 16 | Apears to be defined multiple times as the omxil_core.h |
| 17 | is included in multiple files. |
| 18 | |
| 19 | Signed-off-by: Vincent Davis Jr <vince@underview.tech> |
| 20 | --- |
| 21 | modules/codec/omxil/omxil_core.h | 6 +++--- |
| 22 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 23 | |
| 24 | diff --git a/modules/codec/omxil/omxil_core.h b/modules/codec/omxil/omxil_core.h |
| 25 | index ac3db510b..f6e42f5ed 100644 |
| 26 | --- a/modules/codec/omxil/omxil_core.h |
| 27 | +++ b/modules/codec/omxil/omxil_core.h |
| 28 | @@ -34,9 +34,9 @@ extern OMX_ERRORTYPE (*pf_component_enum)(OMX_STRING, OMX_U32, OMX_U32); |
| 29 | extern OMX_ERRORTYPE (*pf_get_roles_of_component)(OMX_STRING, OMX_U32 *, OMX_U8 **); |
| 30 | |
| 31 | /* Extra IOMX android functions. Can be NULL if we don't link with libiomx */ |
| 32 | -OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); |
| 33 | -OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); |
| 34 | -OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); |
| 35 | +extern OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); |
| 36 | +extern OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); |
| 37 | +extern OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); |
| 38 | |
| 39 | int InitOmxCore(vlc_object_t *p_this); |
| 40 | void DeinitOmxCore(void); |
| 41 | -- |
| 42 | 2.38.1 |
| 43 | |