summaryrefslogtreecommitdiffstats
path: root/stream/asf_streaming.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-01 12:54:38 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-01 12:54:38 +0000
commit3462da0b5c8ff8dc4984769bf67aef6afd871cb1 (patch)
tree2b94f30b5c80e82ebbd02de37cd13660557e9bd2 /stream/asf_streaming.c
parent8e7945155c8d3e02d69afe2686fbaa9f66b8aef7 (diff)
downloadmpv-3462da0b5c8ff8dc4984769bf67aef6afd871cb1.tar.bz2
mpv-3462da0b5c8ff8dc4984769bf67aef6afd871cb1.tar.xz
Replace MIN with FFMIN
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22396 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/asf_streaming.c')
-rw-r--r--stream/asf_streaming.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 13ff3d57ec..7edb0d856a 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -470,7 +470,7 @@ static int asf_http_streaming_read( int fd, char *buffer, int size, streaming_ct
if (drop_chunk) continue;
}
if (rest == 0 && waiting > 0 && size-read > 0) {
- int s = MIN(waiting,size-read);
+ int s = FFMIN(waiting,size-read);
memset(buffer+read,0,s);
waiting -= s;
read += s;