[vlc-commits] OMX: rename GetVlcAudioFormat to OmxToVlcAudioFormat

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep 30 00:16:31 2011 +0200| [2ff4954e5b8c372ba8460841786220880e54293d] | committer: Jean-Baptiste Kempf

OMX: rename GetVlcAudioFormat to OmxToVlcAudioFormat

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ff4954e5b8c372ba8460841786220880e54293d
---

 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 d11b317..ebaeaae 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( !OmxToVlcAudioFormat(def->format.audio.eEncoding,
                                    &p_fmt->i_codec, 0 ) )
             {
                 omx_error = OMX_ErrorNotImplemented;
@@ -448,7 +448,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
         break;
 
     case AUDIO_ES:
-        if( !GetVlcAudioFormat( def->format.audio.eEncoding,
+        if( !OmxToVlcAudioFormat( 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 7d1224e..4294170 100644
--- a/modules/codec/omxil/omxil_utils.h
+++ b/modules/codec/omxil/omxil_utils.h
@@ -155,7 +155,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 OmxToVlcAudioFormat( 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 c3916ed..94435e5 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -426,7 +426,7 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
     return !!audio_format_table[i].i_codec;
 }
 
-int GetVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
+int OmxToVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
                        vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
 {
     unsigned int i;
@@ -875,7 +875,7 @@ void PrintOmx(decoder_t *p_dec, OMX_HANDLETYPE omx_handle, OMX_U32 i_port)
 
             case OMX_PortDomainAudio:
 
-                GetVlcAudioFormat( definition.format.audio.eEncoding,
+                OmxToVlcAudioFormat( definition.format.audio.eEncoding,
                                    &i_fourcc, &psz_name );
 
                 GetAudioParameters(omx_handle, &format_param,