Mercurial > mplayer.hg
comparison subreader.c @ 18870:391faf2c1474
this unrelated and erroneus change was applied on my previous commit, reverted
author | reynaldo |
---|---|
date | Sat, 01 Jul 2006 04:55:54 +0000 |
parents | 682a16136d6c |
children | b80b0c115a24 |
comparison
equal
deleted
inserted
replaced
18869:682a16136d6c | 18870:391faf2c1474 |
---|---|
23 #ifdef HAVE_ENCA | 23 #ifdef HAVE_ENCA |
24 #include <enca.h> | 24 #include <enca.h> |
25 #endif | 25 #endif |
26 | 26 |
27 #define ERR ((void *) -1) | 27 #define ERR ((void *) -1) |
28 #define eol(x) ((x)=='\r' || (x)=='\n' || (x)=='\0') | |
29 | 28 |
30 #ifdef USE_ICONV | 29 #ifdef USE_ICONV |
31 #include <iconv.h> | 30 #include <iconv.h> |
32 char *sub_cp=NULL; | 31 char *sub_cp=NULL; |
33 #endif | 32 #endif |
65 the previous sub: it is initialized to 0 in sub_read_file and eventually | 64 the previous sub: it is initialized to 0 in sub_read_file and eventually |
66 modified by sub_read_aqt_line or sub_read_subrip09_line. | 65 modified by sub_read_aqt_line or sub_read_subrip09_line. |
67 */ | 66 */ |
68 unsigned long previous_sub_end; | 67 unsigned long previous_sub_end; |
69 #endif | 68 #endif |
69 | |
70 static int eol(char p) { | |
71 return (p=='\r' || p=='\n' || p=='\0'); | |
72 } | |
70 | 73 |
71 /* Remove leading and trailing space */ | 74 /* Remove leading and trailing space */ |
72 static void trail_space(char *s) { | 75 static void trail_space(char *s) { |
73 int i = 0; | 76 int i = 0; |
74 while (isspace(s[i])) ++i; | 77 while (isspace(s[i])) ++i; |