[vlc-commits] omxil: Ignore OMX.google.* codecs

[Martin Storsjö]

vlc/vlc-2.0 | branch: master | Martin Storsjö <martin at martin.st> | Fri Jan 27 10:32:22 2012 +0200| [ec30ee5d46fae158ce7ca4026368f6536347a103] | committer: Jean-Baptiste Kempf

omxil: Ignore OMX.google.* codecs

These are sw codecs, mostly the same ones that earlier were present
with names starting with OMX.PV. They don't work properly with the
vlc omxil client code at the moment. Using them doesn't have any
significant advantage over our own bundled sw codecs.

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 94d0697da224b6f9bd41df49d6a221b36d0acbbc)

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

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

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

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index ab81196..3f735a6 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -921,6 +921,9 @@ loaded:
         /* ignore OpenCore software codecs */
         if (!strncmp(p_sys->ppsz_components[i], "OMX.PV.", 7))
             continue;
+        /* The same sw codecs, renamed in ICS (perhaps also in honeycomb) */
+        if (!strncmp(p_sys->ppsz_components[i], "OMX.google.", 11))
+            continue;
 #endif
         omx_error = InitialiseComponent(p_dec, p_sys->ppsz_components[i],
                                         &p_sys->omx_handle);