diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-20 01:45:13 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-20 01:45:13 +0000 |
| commit | 34e3074e5efa935f2022d870842517d4e0d445c4 (patch) | |
| tree | 076a9d822c8ca8a09c8d67343fe13e44d19df461 /src/xine-engine/load_plugins.c | |
| parent | f791bb6196c70f923375f0614f178bddaece877b (diff) | |
| parent | e18856000d2bd7d6447ab6c59d3eb8ee3d354dfc (diff) | |
| download | xine-lib-34e3074e5efa935f2022d870842517d4e0d445c4.tar.gz xine-lib-34e3074e5efa935f2022d870842517d4e0d445c4.tar.bz2 | |
Merge vdpau. THIS CONTAINS ABI CHANGES and is therefore not xine-lib 1.1.
Diffstat (limited to 'src/xine-engine/load_plugins.c')
| -rw-r--r-- | src/xine-engine/load_plugins.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 5128644da..04e0b4461 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1980,7 +1980,13 @@ video_decoder_t *_x_get_video_decoder (xine_stream_t *stream, uint8_t stream_typ vd = ((video_decoder_class_t *)node->plugin_class)->open_plugin(node->plugin_class, stream); - if (vd) { + if (vd == 1) { + /* HACK: plugin failed to instantiate because required resources are unavailable at that time, + but may be available later, so don't remove this plugin from catalog. */ + xprintf(stream->xine, XINE_VERBOSITY_DEBUG, + "load_plugins: plugin %s failed to instantiate, resources temporarily unavailable.\n", node->info->id); + } + else if (vd) { inc_node_ref(node); vd->node = node; xprintf(stream->xine, XINE_VERBOSITY_DEBUG, |