[vlc-devel] [PATCH 02/21] Avoid duplicate symbols when linking the omxil module statically into the same module as the avcodec module

[Martin Storsjo]

From: Martin Storsjö <martin at martin.st>

I'm curious why this issue hasn't popped up before (e.g. on
Maemo/Nokia N900), so this change might not be necessary if
this can be fixed in some other way.
---
 modules/codec/omxil/omxil.c       |    4 ++--
 modules/codec/omxil/omxil_utils.h |    2 +-
 modules/codec/omxil/utils.c       |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 17cfa6b..a684bf9 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -338,7 +338,7 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
         }
         else
         {
-            if( !GetVlcAudioFormat(def->format.audio.eEncoding,
+            if( !GetVlcAudioFormat_omxil(def->format.audio.eEncoding,
                                    &p_fmt->i_codec, 0 ) )
             {
                 omx_error = OMX_ErrorNotImplemented;
@@ -439,7 +439,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
         break;
 
     case AUDIO_ES:
-        if( !GetVlcAudioFormat( def->format.audio.eEncoding,
+        if( !GetVlcAudioFormat_omxil( def->format.audio.eEncoding,
                                 &p_fmt->i_codec, 0 ) )
         {
             omx_error = OMX_ErrorNotImplemented;
diff --git a/modules/codec/omxil/omxil_utils.h b/modules/codec/omxil/omxil_utils.h
index 959f934..ab1a5b5 100644
--- a/modules/codec/omxil/omxil_utils.h
+++ b/modules/codec/omxil/omxil_utils.h
@@ -143,7 +143,7 @@ int GetVlcVideoFormat( OMX_VIDEO_CODINGTYPE i_omx_codec,
 int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
                        OMX_AUDIO_CODINGTYPE *pi_omx_codec,
                        const char **ppsz_name );
-int GetVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
+int GetVlcAudioFormat_omxil( OMX_AUDIO_CODINGTYPE i_omx_codec,
                        vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
 const char *GetOmxRole( vlc_fourcc_t i_fourcc, int i_cat, bool b_enc );
 int GetOmxChromaFormat( vlc_fourcc_t i_fourcc,
diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c
index df1c076..423de38 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -421,7 +421,7 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
     return !!audio_format_table[i].i_codec;
 }
 
-int GetVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
+int GetVlcAudioFormat_omxil( OMX_AUDIO_CODINGTYPE i_omx_codec,
                        vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
 {
     unsigned int i;
@@ -870,7 +870,7 @@ void PrintOmx(decoder_t *p_dec, OMX_HANDLETYPE omx_handle, OMX_U32 i_port)
 
             case OMX_PortDomainAudio:
 
-                GetVlcAudioFormat( definition.format.audio.eEncoding,
+                GetVlcAudioFormat_omxil( definition.format.audio.eEncoding,
                                    &i_fourcc, &psz_name );
 
                 GetAudioParameters(omx_handle, &format_param,
-- 
1.7.2.5