summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-22 02:33:28 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-22 02:33:28 +0000
commitd483a015a2bbca2aec8a287c0ff6eeb0f176a8bb (patch)
tree8f1d76f283da6022022a35e300c30faf93e71e83 /mencoder.c
parent61c5a99851ea41449a513619dd68791c93e30ef3 (diff)
downloadmpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.bz2
mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.xz
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c
index 0363bc4e8a..9973ab3c42 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -66,6 +66,8 @@ static char* banner_text=
#include "fastmemcpy.h"
+#include "linux/timer.h"
+
int vo_doublebuffering=0;
int vo_directrendering=0;
int vo_config_count=0;
@@ -110,8 +112,6 @@ double max_video_time_usage=0;
double max_vout_time_usage=0;
double cur_video_time_usage=0;
double cur_vout_time_usage=0;
-static double audio_time_usage=0;
-static int total_time_usage_start=0;
int benchmark=0;
// A-V sync:
@@ -191,7 +191,6 @@ float lame_param_scale=-1; // unset
#endif
static int vo_w=0, vo_h=0;
-static int input_pitch, input_bpp;
//-------------------------- config stuff:
@@ -1256,7 +1255,6 @@ return interrupted;
static int parse_end_at(struct config *conf, const char* param)
{
- int i;
end_at_type = END_AT_NONE;