[MPlayer-cvslog] r37790 - in trunk/sub: subreader.c subreader.h
reimar
subversion at mplayerhq.hu
Sun Feb 21 17:27:33 CET 2016
Author: reimar
Date: Sun Feb 21 17:27:33 2016
New Revision: 37790
Log:
subreader: Make function "static".
Modified:
trunk/sub/subreader.c
trunk/sub/subreader.h
Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c Sun Feb 21 14:51:31 2016 (r37789)
+++ trunk/sub/subreader.c Sun Feb 21 17:27:33 2016 (r37790)
@@ -1208,6 +1208,8 @@ int sub_utf8_prev=0;
#ifdef CONFIG_ICONV
static iconv_t icdsc = (iconv_t)(-1);
+static const char* guess_cp(stream_t *st, const char *preferred_language, const char *fallback);
+
void subcp_open (stream_t *st)
{
char *tocp = "UTF-8";
@@ -1462,7 +1464,7 @@ const char* guess_buffer_cp(unsigned cha
}
#define MAX_GUESS_BUFFER_SIZE (256*1024)
-const char* guess_cp(stream_t *st, const char *preferred_language, const char *fallback)
+static const char* guess_cp(stream_t *st, const char *preferred_language, const char *fallback)
{
size_t buflen;
unsigned char *buffer;
Modified: trunk/sub/subreader.h
==============================================================================
--- trunk/sub/subreader.h Sun Feb 21 14:51:31 2016 (r37789)
+++ trunk/sub/subreader.h Sun Feb 21 17:27:33 2016 (r37790)
@@ -101,7 +101,6 @@ struct stream;
void subcp_open (struct stream *st); /* for demux_ogg.c */
void subcp_close (void); /* for demux_ogg.c */
const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback);
-const char* guess_cp(struct stream *st, const char *preferred_language, const char *fallback);
void load_subtitles(const char *fname, float fps, open_sub_func add_f);
void load_vob_subtitle(const char *fname, const char * const spudec_ifo, void **spu, open_vob_func add_f);
void list_sub_file(sub_data* subd);
More information about the MPlayer-cvslog
mailing list