qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-26 00:35:21 +02:00
Code

mplayer: fix silly crash bug with -vo cvidix (when jz47xx_drv.so present).

Browse Source 
add some more debug output for now.
This commit is contained in:
David Kühling 2011-03-05 15:03:39 +01:00
parent 9450286607
commit 81b4266594
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mplayer/patches/010-jz47xx-vidix.patch
View File

@ -1,7 +1,7 @@
Index: MPlayer-1.0rc3/vidix/drivers.c Index: MPlayer-1.0rc3/vidix/drivers.c
=================================================================== ===================================================================
--- MPlayer-1.0rc3.orig/vidix/drivers.c 2011-03-05 12:13:32.000000000 +0100 --- MPlayer-1.0rc3.orig/vidix/drivers.c 2011-03-05 12:13:32.000000000 +0100
+++ MPlayer-1.0rc3/vidix/drivers.c 2011-03-05 13:01:41.000000000 +0100 +++ MPlayer-1.0rc3/vidix/drivers.c 2011-03-05 14:50:38.000000000 +0100
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
@ -10,7 +10,7 @@ Index: MPlayer-1.0rc3/vidix/drivers.c
#include "config.h" #include "config.h"
#include "vidix.h" #include "vidix.h"
@@ -102,6 +103,30 @@ @@ -102,6 +103,32 @@
#ifdef CONFIG_VIDIX_DRV_UNICHROME #ifdef CONFIG_VIDIX_DRV_UNICHROME
vidix_register_driver (&unichrome_drv); vidix_register_driver (&unichrome_drv);
#endif #endif
@ -22,26 +22,28 @@ Index: MPlayer-1.0rc3/vidix/drivers.c
+ void *h = dlopen(lib, RTLD_NOW); + void *h = dlopen(lib, RTLD_NOW);
+ if (h) + if (h)
+ { + {
+ printf ("vidix: managed to load %s", lib); + printf ("vidix: managed to load %s\n", lib);
+ drv = dlsym(h, sym); + drv = dlsym(h, sym);
+ if (!drv) + if (!drv)
+ { + {
+ printf ("vidix: failed to resove symbol '%s'", sym); + printf ("vidix: failed to resove symbol '%s'\n", sym);
+ } + }
+ else + else
+ { + {
+ vidix_register_driver((VDXDriver*)sym); + printf("registering %s (0x%lx)\n", sym, (long)drv);
+ vidix_register_driver((VDXDriver*)drv);
+ printf("registered %s (0x%lx)\n", sym, (long)drv);
+ } + }
+ } + }
+ else + else
+ { + {
+ printf ("vidix: loading %s failed: %m", lib); + printf ("vidix: loading %s failed: %m\n", lib);
+ } + }
+ } + }
} }
static int vidix_probe_driver (VDXContext *ctx, VDXDriver *drv, static int vidix_probe_driver (VDXContext *ctx, VDXDriver *drv,
@@ -190,3 +215,11 @@ @@ -190,3 +217,11 @@
ctx->drv = NULL; ctx->drv = NULL;
return 0; return 0;
} }