summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-08-12 12:21:07 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-08-12 12:21:07 +0000
commitb39cfa205fdb83608bebf1eec78d9c54d5bef226 (patch)
tree371980e8ed34e3e448123cbe007a88aee7905fb0
parent9dd9d9a79134117555d6153fe199457d0e7ccdc3 (diff)
downloadmpv-b39cfa205fdb83608bebf1eec78d9c54d5bef226.tar.bz2
mpv-b39cfa205fdb83608bebf1eec78d9c54d5bef226.tar.xz
Declare all vo_gamma variables in libvo/video_out.h and remove them from
mp_core.h to avoid some redundant redeclaration warnings. patch by Gábor Mizda, gabrov freemail hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24047 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/video_out.h1
-rw-r--r--mp_core.h8
2 files changed, 1 insertions, 8 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h
index eb1e6fe13f..7bfc2e0bb7 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -220,6 +220,7 @@ extern int vo_rootwin;
extern int vo_ontop;
extern int vo_border;
+extern int vo_gamma_gamma;
extern int vo_gamma_brightness;
extern int vo_gamma_saturation;
extern int vo_gamma_contrast;
diff --git a/mp_core.h b/mp_core.h
index 0dce78a426..c56cbf0c40 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -115,14 +115,6 @@ extern int fixed_vo;
extern int ass_enabled;
extern int forced_subs_only;
-// These were listed as externs in mplayer.c, should be in some other header
-extern int vo_gamma_gamma;
-extern int vo_gamma_brightness;
-extern int vo_gamma_contrast;
-extern int vo_gamma_saturation;
-extern int vo_gamma_hue;
-
-
int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data);
void uninit_player(unsigned int mask);