[vlc-commits] omxil: Use a fake library name when loading IOMX

Martin Storsjö git at videolan.org
Tue Dec 20 00:23:45 CET 2011


vlc/vlc-1.2 | branch: master | Martin Storsjö <martin at martin.st> | Fri Dec 16 23:47:06 2011 +0200| [d0fcc89f7d110d305ff47c3f387a3eb466147496] | committer: Jean-Baptiste Kempf

omxil: Use a fake library name when loading IOMX

The iomx loading stub doesn't use the library name.
If there's errors in loading the function pointers, this
gives slightly more correct error messages.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 282e4d503739dc4aa4654612e3b6eac2d489df94)

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

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

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

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index d46bb31..dde8126 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -58,9 +58,13 @@
  *****************************************************************************/
 static const char *ppsz_dll_list[] =
 {
+#if defined(USE_IOMX)
+    "libiomx.so", /* Not used when using IOMX, the lib should already be loaded */
+#else
     "libOMX_Core.so", /* TI OMAP IL core */
     "libOmxCore.so", /* Qualcomm IL core */
     "libomxil-bellagio.so",  /* Bellagio IL core */
+#endif
     0
 };
 



More information about the vlc-commits mailing list