diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /src/spu_dec/spudec.c | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'src/spu_dec/spudec.c')
| -rw-r--r-- | src/spu_dec/spudec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/spu_dec/spudec.c b/src/spu_dec/spudec.c index 13136a53f..3e8cd8a07 100644 --- a/src/spu_dec/spudec.c +++ b/src/spu_dec/spudec.c @@ -871,15 +871,14 @@ static void spudec_discover_clut(xine_t *xine, spudec_state_t *state, vo_overlay int n,i; rle_elem_t *rle; - int found[2][16]; + int found[2][16] = { { 0, }, }; - static clut_t text_clut[] = { + static const clut_t text_clut[] = { CLUT_Y_CR_CB_INIT(0x80, 0x90, 0x80), CLUT_Y_CR_CB_INIT(0x00, 0x90, 0x00), CLUT_Y_CR_CB_INIT(0xff, 0x90, 0x00) }; - memset(found,0,sizeof(found)); rle = ovl->rle; /* this seems to be a problem somewhere else, @@ -1010,7 +1009,7 @@ int spudec_copy_nav_to_overlay(xine_t *xine, pci_t* nav_pci, uint32_t* clut, #endif for (i = 0;i < 4; i++) { #ifdef LOG_BUTTON - printf("libspudec:btn_coln = 0, hili_color = color\n"); + printf("libspudec:btn_coln = 0, hili_color = colour\n"); #endif overlay->hili_color[i] = overlay->color[i]; overlay->hili_trans[i] = overlay->trans[i]; |