summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authormplayer-svn <svn@mplayerhq.hu>2012-03-04 14:37:31 +0000
committerwm4 <wm4@nowhere>2012-08-03 01:52:40 +0200
commitbbc9fccd46de31bacdf132762a7c0d1f8a4caf53 (patch)
tree6890f6648aac93605336a76d7bc5d236e8ea4446 /mplayer.c
parent0dce860f6c74df1c10351bd8bbbdcc406236925e (diff)
downloadmpv-bbc9fccd46de31bacdf132762a7c0d1f8a4caf53.tar.bz2
mpv-bbc9fccd46de31bacdf132762a7c0d1f8a4caf53.tar.xz
cache2: allow cache sizes up to 4 TB
Remove variable that is only assigned but never used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34791 b3059339-0415-0410-9bf9-f77b7e298cf2 Allow using a cache size of up to 4 TB. Obviously anything close to 4 GB will always fail on 32 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34792 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace off_t by int64_t in cache code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34793 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove casts that are no longer necessary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34794 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix header file after r34793. Patch by Stephen Sheldon, sfsheldo gmail com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34802 b3059339-0415-0410-9bf9-f77b7e298cf2 Put #include <inttypes.h> into the header file where it should be. Reported by Stephen Sheldon, sfsheldo gmail com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34798 b3059339-0415-0410-9bf9-f77b7e298cf2 Correct r34798. The header only needs stdint.h while the C file needs inttypes.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34799 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index 3e8c0c543b..a10dcd3d35 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3814,9 +3814,9 @@ goto_enable_cache:
int res;
float stream_cache_min_percent = opts->stream_cache_min_percent;
float stream_cache_seek_min_percent = opts->stream_cache_seek_min_percent;
- res = stream_enable_cache(mpctx->stream, stream_cache_size * 1024,
- stream_cache_size * 1024 * (stream_cache_min_percent / 100.0),
- stream_cache_size * 1024 * (stream_cache_seek_min_percent / 100.0));
+ res = stream_enable_cache(mpctx->stream, stream_cache_size * 1024ull,
+ stream_cache_size * 1024ull * (stream_cache_min_percent / 100.0),
+ stream_cache_size * 1024ull * (stream_cache_seek_min_percent / 100.0));
if (res == 0)
if (libmpdemux_was_interrupted(mpctx))
goto goto_next_file;