diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:36:35 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:36:35 +0200 |
commit | 4857965118bd0b272093f901167df35e22384c94 (patch) | |
tree | ca7217580f8d8b634ec35b0d853ffc88ecf3cbfb /stream/stream.h | |
parent | bc1d0ca37d9bdfd69a945043650e0246ffeb5f94 (diff) | |
parent | be23797ee7428e177b3476effb29beee4bfa7510 (diff) | |
download | mpv-4857965118bd0b272093f901167df35e22384c94.tar.bz2 mpv-4857965118bd0b272093f901167df35e22384c94.tar.xz |
Merge svn changes up to r30815
Diffstat (limited to 'stream/stream.h')
-rw-r--r-- | stream/stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream.h b/stream/stream.h index 3690dc46aa..7d6619f75b 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -269,7 +269,7 @@ inline static int stream_read(stream_t *s,char* mem,int total){ return total; } -unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max); +unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max, int utf16); inline static int stream_eof(stream_t *s){ return s->eof; |