diff options
author | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-27 22:51:16 +0100 |
---|---|---|
committer | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-27 22:51:16 +0100 |
commit | faf759b603c694a968e343918e750fcfa19c3e1e (patch) | |
tree | 7e33687a03ce68d78505486ca9f19911adea9bc1 /include/xine/alphablend.h | |
parent | 6b3ab6fcfbeef4c604cfe5819ede30d60c620d3b (diff) | |
parent | 1484cd98330543db0f70955cb8877aeab7f8f06f (diff) | |
download | xine-lib-faf759b603c694a968e343918e750fcfa19c3e1e.tar.gz xine-lib-faf759b603c694a968e343918e750fcfa19c3e1e.tar.bz2 |
Merge.
Diffstat (limited to 'include/xine/alphablend.h')
-rw-r--r-- | include/xine/alphablend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xine/alphablend.h b/include/xine/alphablend.h index 6df5ad809..f4aeb442f 100644 --- a/include/xine/alphablend.h +++ b/include/xine/alphablend.h @@ -106,7 +106,7 @@ void _x_dispose_xx44_palette(xx44_palette_t *p) XINE_PROTECTED; void _x_xx44_to_xvmc_palette(const xx44_palette_t *p,unsigned char *xvmc_palette, unsigned first_xx44_entry, unsigned num_xx44_entries, - unsigned num_xvmc_components, char *xvmc_components) XINE_PROTECTED; + unsigned num_xvmc_components, const char *xvmc_components) XINE_PROTECTED; #endif |