diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:14:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:35:02 +0200 |
| commit | bc1d0ca37d9bdfd69a945043650e0246ffeb5f94 (patch) | |
| tree | 8269c9cbc1df72afb5715b77669698a0781f6250 /subreader.c | |
| parent | f7cc4152f7c55808c5dd6bbd49c216c9345eb686 (diff) | |
| parent | e9a5e7f667d1b0c0dec0053ad9ec6f7bc3162b60 (diff) | |
| download | mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.bz2 mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.xz | |
Merge svn changes up to r30798
Diffstat (limited to 'subreader.c')
| -rw-r--r-- | subreader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subreader.c b/subreader.c index fa3b1a49ba..d2f4afbeb0 100644 --- a/subreader.c +++ b/subreader.c @@ -1355,7 +1355,7 @@ sub_data* sub_read_file (char *filename, float fps) { subtitle *first, *second, *sub, *return_sub, *alloced_sub = NULL; sub_data *subt_data; int uses_time = 0, sub_num = 0, sub_errs = 0; - struct subreader sr[]= + static const struct subreader sr[]= { { sub_read_line_microdvd, NULL, "microdvd" }, { sub_read_line_subrip, NULL, "subrip" }, @@ -1372,7 +1372,7 @@ sub_data* sub_read_file (char *filename, float fps) { { sub_read_line_jacosub, NULL, "jacosub" }, { sub_read_line_mpl2, NULL, "mpl2" } }; - struct subreader *srp; + const struct subreader *srp; if(filename==NULL) return NULL; //qnx segfault i = 0; @@ -1433,7 +1433,7 @@ sub_data* sub_read_file (char *filename, float fps) { sub=srp->read(fd,sub); if(!sub) break; // EOF #ifdef CONFIG_ICONV - if ((sub!=ERR) && (sub_utf8 & 2)) sub=subcp_recode(sub); + if ((sub!=ERR) && sub_utf8 == 2) sub=subcp_recode(sub); #endif #ifdef CONFIG_FRIBIDI if (sub!=ERR) sub=sub_fribidi(sub,sub_utf8,0); |