From e6491929982ee688487bee2b8ace43e3ae9ffb3f Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Fri, 16 Dec 2011 09:56:23 +0200 Subject: Fixed osd_hide() return value --HG-- branch : point-release --- src/xine-engine/osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 32e5e36fd..1d22ea303 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -374,7 +374,7 @@ static int osd_hide (osd_object_t *osd, int64_t vpts) { this->stream->xine->port_ticket->release(this->stream->xine->port_ticket, 1); - return 1; + return ret; } -- cgit v1.2.3 From 6b454a7621efa197b3f922c1ea840b359ac573b2 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Fri, 16 Dec 2011 11:15:58 +0200 Subject: Removed write-only variables --HG-- branch : point-release --- src/xine-engine/load_plugins.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 0080bc30c..06ff719e0 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1662,7 +1662,6 @@ xine_video_port_t *xine_new_framegrab_video_port (xine_t *this) { plugin_node_t *node; vo_driver_t *driver; xine_video_port_t *port; - vo_info_t *vo_info; plugin_catalog_t *catalog = this->plugin_catalog; char *id; int list_id, list_size; @@ -1677,7 +1676,6 @@ xine_video_port_t *xine_new_framegrab_video_port (xine_t *this) { node = xine_sarray_get (catalog->plugin_lists[PLUGIN_VIDEO_OUT - 1], list_id); - vo_info = (vo_info_t *)node->info->special_info; if (!strcasecmp (node->info->id, id)) { driver = _load_video_driver (this, node, NULL); break; @@ -1772,7 +1770,6 @@ ao_driver_t *_x_load_audio_output_plugin (xine_t *this, const char *id) { plugin_node_t *node; ao_driver_t *driver = NULL; - ao_info_t *ao_info; plugin_catalog_t *catalog = this->plugin_catalog; int list_id, list_size; @@ -1783,8 +1780,6 @@ ao_driver_t *_x_load_audio_output_plugin (xine_t *this, const char *id) node = xine_sarray_get (this->plugin_catalog->plugin_lists[PLUGIN_AUDIO_OUT - 1], list_id); - ao_info = (ao_info_t *)node->info->special_info; - if (!strcasecmp(node->info->id, id)) { driver = _load_audio_driver (this, node, NULL); break; -- cgit v1.2.3