summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-23 15:27:49 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-23 15:27:49 +0000
commitcdfc03fab6400f2bde66c21db70c2c4c38951bc8 (patch)
tree773bacaa56003071e1e2d8e66733faf8065633ae
parent38ea65626f19c3451090bb40f9ada9757b7519da (diff)
downloadmpv-cdfc03fab6400f2bde66c21db70c2c4c38951bc8.tar.bz2
mpv-cdfc03fab6400f2bde66c21db70c2c4c38951bc8.tar.xz
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6164 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--subreader.c2
-rw-r--r--vobsub.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/subreader.c b/subreader.c
index c2991b74af..71913a6d72 100644
--- a/subreader.c
+++ b/subreader.c
@@ -658,7 +658,7 @@ subtitle* subcp_recode (subtitle *sub)
ileft = strlen(ip);
oleft = ICBUFFSIZE - 1;
- if (iconv(icdsc, (const char **) &ip, &ileft,
+ if (iconv(icdsc, &ip, &ileft,
&op, &oleft) == (size_t)(-1)) {
printf ("SUB: error recoding line.\n");
l++;
diff --git a/vobsub.c b/vobsub.c
index 2f90338938..b573d7c264 100644
--- a/vobsub.c
+++ b/vobsub.c
@@ -725,7 +725,7 @@ vobsub_parse_one_line(vobsub_t *vob, FILE *fd)
ssize_t line_size;
int res = -1;
do {
- int line_reserve = 0;
+ size_t line_reserve = 0;
char *line = NULL;
line_size = getline(&line, &line_reserve, fd);
if (line_size < 0) {