diff options
| author | František Dvořák <valtri@civ.zcu.cz> | 2008-11-20 20:56:19 +0100 |
|---|---|---|
| committer | František Dvořák <valtri@civ.zcu.cz> | 2008-11-20 20:56:19 +0100 |
| commit | ea2b5508e35f5125fd65730822b30bb8895ad87d (patch) | |
| tree | e03317e974e1bf818ca50904242595fa01db25df /src/libspucc | |
| parent | 2ba1e128cbb791cfdb2829895a854bb664018912 (diff) | |
| download | xine-lib-ea2b5508e35f5125fd65730822b30bb8895ad87d.tar.gz xine-lib-ea2b5508e35f5125fd65730822b30bb8895ad87d.tar.bz2 | |
Some warning fixes: XINE_FORMAT_SCANF, statics in headers, consts, ...
Add warning flags to the DEBUG_CFLAGS too.
Diffstat (limited to 'src/libspucc')
| -rw-r--r-- | src/libspucc/cc_decoder.h | 8 | ||||
| -rw-r--r-- | src/libspucc/xine_cc_decoder.c | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/libspucc/cc_decoder.h b/src/libspucc/cc_decoder.h index 8698189a6..47703b6d1 100644 --- a/src/libspucc/cc_decoder.h +++ b/src/libspucc/cc_decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2008 the xine project * * Copyright (C) Christian Vogler * cvogler@gradient.cis.upenn.edu - December 2001 @@ -31,11 +31,7 @@ typedef struct cc_decoder_s cc_decoder_t; typedef struct cc_renderer_s cc_renderer_t; #define NUM_CC_PALETTES 2 -static const char *cc_schemes[NUM_CC_PALETTES + 1] = { - "White/Gray/Translucent", - "White/Black/Solid", - NULL -}; +extern const char *cc_schemes[]; #define CC_FONT_MAX 256 diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index 0018bfa1e..1d9c87366 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2008 the xine project * * This file is part of xine, a free video player. * @@ -33,6 +33,12 @@ #define LOG_DEBUG 1 */ +const char *cc_schemes[NUM_CC_PALETTES + 1] = { + "White/Gray/Translucent", + "White/Black/Solid", + NULL +}; + typedef struct spucc_decoder_s { spu_decoder_t spu_decoder; @@ -193,7 +199,7 @@ static void spucc_register_cfg_vars(spucc_class_t *this, cc_vars->cc_scheme = xine_cfg->register_enum(xine_cfg, "subtitles.closedcaption.scheme", 0, - cc_schemes, + (char **)cc_schemes, _("closed-captioning foreground/background scheme"), _("Choose your favourite rendering of the closed " "captions."), |