From d73832f95219564fc888ec253b4b29f87a08f804 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 12 Jul 2005 17:58:09 +0000 Subject: [PATCH] Eliminate dead code --- src/misc/charset.c | 6 ++++-- src/misc/image.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/misc/charset.c b/src/misc/charset.c index 23ec2cfc24..adb86bb9fe 100644 --- a/src/misc/charset.c +++ b/src/misc/charset.c @@ -59,7 +59,7 @@ typedef struct VLCCharsetAlias * a lot of basic aliases (check it first by iconv -l). * */ - +#if defined WIN32 || defined OS2 || !HAVE_LANGINFO_CODESET static const char* vlc_encoding_from_language( const char *l ) { /* check for language (and perhaps country) codes */ @@ -91,7 +91,7 @@ static const char* vlc_encoding_from_language( const char *l ) /* We don't know. This ain't working go to default. */ return "ISO-8859-1"; } - +#endif static const char* vlc_charset_aliases( const char *psz_name ) { @@ -197,6 +197,7 @@ static const char* vlc_charset_aliases( const char *psz_name ) } /* Returns charset from "language_COUNTRY.charset@modifier" string */ +#if defined WIN32 || defined OS2 || !HAVE_LANGINFO_CODESET static char *vlc_encoding_from_locale( char *psz_locale ) { char *psz_dot = strchr( psz_locale, '.' ); @@ -224,6 +225,7 @@ static char *vlc_encoding_from_locale( char *psz_locale ) /* try language mapping */ return (char *)vlc_encoding_from_language( psz_locale ); } +#endif vlc_bool_t vlc_current_charset( char **psz_charset ) { diff --git a/src/misc/image.c b/src/misc/image.c index 0741d34f01..d8888fe6b7 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -57,7 +57,7 @@ static filter_t *CreateFilter( vlc_object_t *, es_format_t *, static void DeleteFilter( filter_t * ); static vlc_fourcc_t Ext2Fourcc( const char * ); -static const char *Fourcc2Ext( vlc_fourcc_t ); +/*static const char *Fourcc2Ext( vlc_fourcc_t );*/ /** * Create an image_handler_t instance @@ -471,6 +471,7 @@ static vlc_fourcc_t Ext2Fourcc( const char *psz_name ) return 0; } +/* static const char *Fourcc2Ext( vlc_fourcc_t i_codec ) { int i; @@ -482,6 +483,7 @@ static const char *Fourcc2Ext( vlc_fourcc_t i_codec ) return NULL; } +*/ static void video_release_buffer( picture_t *p_pic ) { -- 2.39.2