diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-10 15:11:16 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-10 15:11:16 +0200 |
| commit | d0ed14e386dd7fc8c49e1e843c5cfc9e351ea3e5 (patch) | |
| tree | f3bfffbcb5bb0ba422667b774e27d979a027b1e7 /src | |
| parent | 2f744e75713bfdab5832ebe6516cf3c96e6ffbf1 (diff) | |
| parent | 00a8fc0dbeccdd7bda8246475fc2d079202b524a (diff) | |
| download | xine-lib-d0ed14e386dd7fc8c49e1e843c5cfc9e351ea3e5.tar.gz xine-lib-d0ed14e386dd7fc8c49e1e843c5cfc9e351ea3e5.tar.bz2 | |
Merge from 1.1
--HG--
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/spu_dec/sputext_decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/spu_dec/sputext_decoder.c b/src/spu_dec/sputext_decoder.c index ae16cde37..0eb42d665 100644 --- a/src/spu_dec/sputext_decoder.c +++ b/src/spu_dec/sputext_decoder.c @@ -122,7 +122,7 @@ typedef struct sputext_class_s { char font_ft[FILENAME_MAX]; /* subtitle font */ int use_font_ft; /* use Freetype */ #endif - char *src_encoding; /* encoding of subtitle file */ + const char *src_encoding; /* encoding of subtitle file */ int use_unscaled; /* use unscaled OSD if possible */ xine_t *xine; |