[vlc-commits] omxil: ignore software codecs

[Ming Hu]

vlc | branch: master | Ming Hu <tewilove at gmail.com> | Thu Sep 29 12:16:54 2011 +0200| [85336e05f74d244a0bf8553b124b7cbc0cbbd97c] | committer: Jean-Baptiste Kempf

omxil: ignore software codecs

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/omxil/omxil.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index a032850..fd272bf 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -860,8 +860,14 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
     }
 
     /* Try to load and initialise a component */
+    omx_error = OMX_ErrorUndefined;
     for(i = 0; i < p_sys->components; i++)
     {
+#ifdef __ANDROID__
+        /* ignore OpenCore software codecs */
+        if (!strncmp(p_sys->ppsz_components[i], "OMX.PV.", 7))
+            continue;
+#endif
         omx_error = InitialiseComponent(p_dec, p_sys->ppsz_components[i],
                                         &p_sys->omx_handle);
         if(omx_error == OMX_ErrorNone) break;