diff options
author | wm4 <wm4@nowhere> | 2014-05-30 13:30:56 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-14 14:07:23 +0200 |
commit | d52c491fec6cc27e54cd94f3fe5aa5f0c5888612 (patch) | |
tree | a126fceebc217f7f8db0c28342c111303d43ffe6 | |
parent | ff2e39a3d28ce4f08a4683577844cd0f2f6c7fb2 (diff) | |
download | mpv-d52c491fec6cc27e54cd94f3fe5aa5f0c5888612.tar.bz2 mpv-d52c491fec6cc27e54cd94f3fe5aa5f0c5888612.tar.xz |
tv: remove sysinfo() usage
This call was used limited the buffer size if installed RAM was below 16
MB. This stopped being useful a decade ago. The check could also
overflow on 32 bit systems. Just get rid of it.
old-configure changes skipped when cherry-picking for stable.
Conflicts:
old-configure
-rw-r--r-- | stream/tvi_v4l2.c | 10 | ||||
-rw-r--r-- | wscript | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index b6f77edf31..c7fba6a3e5 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -46,9 +46,6 @@ known issues: #include <sys/types.h> #include <unistd.h> #include <math.h> -#if HAVE_SYS_SYSINFO_H -#include <sys/sysinfo.h> -#endif #if HAVE_SYS_VIDEOIO_H #include <sys/videoio.h> #else @@ -1230,13 +1227,6 @@ static int get_capture_buffer_size(priv_t *priv) if (priv->tv_param->buffer_size >= 0) { bufsize = priv->tv_param->buffer_size*1024*1024; } else { -#if HAVE_SYS_SYSINFO_H - struct sysinfo si; - - sysinfo(&si); - bufsize = (si.freeram/2)*si.mem_unit; - if ( bufsize < 16*1024*1024) -#endif bufsize = 16*1024*1024; } @@ -188,11 +188,6 @@ iconv support use --disable-iconv.", 'desc': 'setmode()', 'func': check_statement('io.h', 'setmode(0, 0)') }, { - 'name': 'sys-sysinfo-h', - 'desc': 'sys/sysinfo.h', - 'func': check_statement('sys/sysinfo.h', - 'struct sysinfo s_info; s_info.mem_unit=0; sysinfo(&s_info)') - }, { 'name': '--libguess', 'desc': 'libguess support', 'func': check_pkg_config('libguess', '>= 1.0'), |