summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-16 16:55:51 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-16 16:55:51 +0000
commit207554c9ea38d43790c65fedc4eca92e0dde8b67 (patch)
treebf1d0c4149a4c41a8cd08fe7f845ffae77a08197 /libmpdemux
parentbadc607fa1a8c5e3d5fcd3a0f70f480bb9e1a1c9 (diff)
downloadmpv-207554c9ea38d43790c65fedc4eca92e0dde8b67.tar.bz2
mpv-207554c9ea38d43790c65fedc4eca92e0dde8b67.tar.xz
Fix compilation with stupid C++ compilers that shock on valid C
constructs in an extern "C" { }. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17881 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/stream.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index 0b4361cb74..48f5e6adf8 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -217,7 +217,7 @@ inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, in
if(len <= 0 &&
(!cache_stream_fill_buffer(s) ||
(len = s->buf_len-s->buf_pos) <= 0)) break;
- end = memchr((void*)(s->buffer+s->buf_pos),'\n',len);
+ end = (unsigned char*) memchr((void*)(s->buffer+s->buf_pos),'\n',len);
if(end) len = end - (s->buffer+s->buf_pos) + 1;
if(len > 0 && max > 1) {
int l = len > max-1 ? max-1 : len;