summaryrefslogtreecommitdiff
path: root/multimedia/mplayer-share/patches/patch-ah
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/mplayer-share/patches/patch-ah')
-rw-r--r--multimedia/mplayer-share/patches/patch-ah23
1 files changed, 16 insertions, 7 deletions
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-ah
index 42fadef939c..8e1d2825af3 100644
--- a/multimedia/mplayer-share/patches/patch-ah
+++ b/multimedia/mplayer-share/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2010/09/16 18:56:12 wiz Exp $
+$NetBSD: patch-ah,v 1.5 2011/10/18 16:04:36 drochner Exp $
---- subreader.c.orig 2010-08-29 11:27:00.000000000 +0000
+--- subreader.c.orig 2010-09-11 11:11:10.000000000 +0000
+++ subreader.c
-@@ -94,10 +94,10 @@ static int eol(char p) {
+@@ -92,10 +92,10 @@ static int eol(char p) {
/* Remove leading and trailing space */
static void trail_space(char *s) {
int i = 0;
@@ -15,7 +15,16 @@ $NetBSD: patch-ah,v 1.4 2010/09/16 18:56:12 wiz Exp $
}
static char *stristr(const char *haystack, const char *needle) {
-@@ -725,7 +725,7 @@ static subtitle *sub_read_line_pjs(strea
+@@ -171,6 +171,8 @@ static subtitle *sub_read_line_sami(stre
+ break;
+
+ case 3: /* get all text until '<' appears */
++ if (p - text >= LINE_LEN)
++ sami_add_line(current, text, &p);
+ if (*s == '\0') break;
+ else if (!strncasecmp (s, "<br>", 4)) {
+ sami_add_line(current, text, &p);
+@@ -723,7 +725,7 @@ static subtitle *sub_read_line_pjs(strea
if (!stream_read_line (st, line, LINE_LEN, utf16))
return NULL;
/* skip spaces */
@@ -24,7 +33,7 @@ $NetBSD: patch-ah,v 1.4 2010/09/16 18:56:12 wiz Exp $
/* allow empty lines at the end of the file */
if (*s==0)
return NULL;
-@@ -778,7 +778,7 @@ static subtitle *sub_read_line_mpsub(str
+@@ -776,7 +778,7 @@ static subtitle *sub_read_line_mpsub(str
else return current;
}
p=line;
@@ -33,7 +42,7 @@ $NetBSD: patch-ah,v 1.4 2010/09/16 18:56:12 wiz Exp $
if (eol(*p) && num > 0) return current;
if (eol(*p)) return NULL;
-@@ -1824,18 +1824,18 @@ char * strreplace( char * in,char * what
+@@ -1822,18 +1824,18 @@ char * strreplace( char * in,char * what
static void strcpy_trim(char *d, char *s)
{
// skip leading whitespace
@@ -55,7 +64,7 @@ $NetBSD: patch-ah,v 1.4 2010/09/16 18:56:12 wiz Exp $
s++;
}
if (*s == 0) break;
-@@ -1874,7 +1874,7 @@ static void strcpy_get_ext(char *d, char
+@@ -1872,7 +1874,7 @@ static void strcpy_get_ext(char *d, char
static int whiteonly(char *s)
{
while (*s) {