diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-10 21:42:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-10 21:42:53 +0000 |
| commit | f5646d5518c1233f8e048727e7f92921f8e5b9af (patch) | |
| tree | 75f8735c193c7ff467920128cd158aee4b4c3c69 | |
| parent | c4888045440dadbd2e861b7cf3dae6065e895385 (diff) | |
| parent | 8f9bca37fbfd25506fe719898c8cf3bfc62704e8 (diff) | |
| download | xine-lib-f5646d5518c1233f8e048727e7f92921f8e5b9af.tar.gz xine-lib-f5646d5518c1233f8e048727e7f92921f8e5b9af.tar.bz2 | |
Merge.
| -rw-r--r-- | src/xine-engine/configfile.c | 3 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 924fbe02a..b334dfaa5 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -352,7 +352,7 @@ static void config_remove(config_values_t *this, cfg_entry_t *entry, cfg_entry_t prev->next = entry->next; } -static char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans) +static const char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans) { --trans; while ((++trans)->old_name) @@ -1284,7 +1284,6 @@ static char* config_get_serialized_entry (config_values_t *this, const char *key int str_default_len = 0; int description_len = 0; int help_len = 0; - unsigned long output_len; unsigned long total_len; int value_count; int value_len[10]; diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index bbe5f0910..8189592ba 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2121,7 +2121,7 @@ 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 == 1) { + if (vd == (video_decoder_t*)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, @@ -2631,7 +2631,7 @@ void xine_post_dispose(xine_t *xine, xine_post_t *post_gen) { * @param joining String to use to join the various strings together. * @param final_length The pre-calculated final length of the string. */ -static char *_x_concatenate_with_string(char const **strings, size_t count, char *joining, size_t final_length) { +static char *_x_concatenate_with_string(char const **strings, size_t count, const char *joining, size_t final_length) { size_t i; char *const result = malloc(final_length+1); /* Better be safe */ char *str = result; @@ -2780,7 +2780,7 @@ static void dispose_plugin_list (xine_sarray_t *list, int is_cache) { case PLUGIN_VIDEO_DECODER: decoder_info = (decoder_info_t *)node->info->special_info; - free (decoder_info->supported_types); + free ((void *)decoder_info->supported_types); default: free ((void *)node->info->special_info); @@ -2788,7 +2788,7 @@ static void dispose_plugin_list (xine_sarray_t *list, int is_cache) { } /* free info structure and string copies */ - free (node->info->id); + free ((void *)node->info->id); free (node->info); /* don't free the entry list if the node is cache */ |