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 /src/xine-engine/alphablend.c | |
| parent | 6b3ab6fcfbeef4c604cfe5819ede30d60c620d3b (diff) | |
| parent | 1484cd98330543db0f70955cb8877aeab7f8f06f (diff) | |
| download | xine-lib-faf759b603c694a968e343918e750fcfa19c3e1e.tar.gz xine-lib-faf759b603c694a968e343918e750fcfa19c3e1e.tar.bz2 | |
Merge.
Diffstat (limited to 'src/xine-engine/alphablend.c')
| -rw-r--r-- | src/xine-engine/alphablend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c index db43fd53a..6e7191ed2 100644 --- a/src/xine-engine/alphablend.c +++ b/src/xine-engine/alphablend.c @@ -1923,7 +1923,7 @@ void _x_dispose_xx44_palette(xx44_palette_t *p) } static void colorToPalette(const uint32_t *icolor, unsigned char *palette_p, - unsigned num_xvmc_components, char *xvmc_components) + unsigned num_xvmc_components, const char *xvmc_components) { const clut_t *color = (const clut_t *) icolor; unsigned int i; @@ -1941,7 +1941,7 @@ static void colorToPalette(const uint32_t *icolor, unsigned char *palette_p, 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) + unsigned num_xvmc_components, const char *xvmc_components) { register unsigned int i; register const uint32_t *cluts = p->cluts + first_xx44_entry; |