diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
| commit | 544233bded74186eca2498e202ed82003c5e04be (patch) | |
| tree | f6360316ae6a9a2b01bac7ff6494ee94bd655cf2 /libvo/vo_caca.c | |
| parent | 6982f81d903afe3838cd743d5f0b50e10be2f2cc (diff) | |
| download | mpv-544233bded74186eca2498e202ed82003c5e04be.tar.bz2 mpv-544233bded74186eca2498e202ed82003c5e04be.tar.xz | |
Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_caca.c')
| -rw-r--r-- | libvo/vo_caca.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index 74342f6cb1..86c46fa7e7 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -284,12 +284,10 @@ static void uninit(void) static void draw_osd(void) { -#ifdef USE_OSD if (vo_osd_progbar_type != -1) osdpercent(MESSAGE_DURATION, 0, 255, vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type], ""); -#endif } static int preinit(const char *arg) @@ -318,11 +316,7 @@ static int preinit(const char *arg) static int query_format(uint32_t format) { if (format == IMGFMT_BGR24) - return -#ifdef USE_OSD - VFCAP_OSD | -#endif - VFCAP_CSP_SUPPORTED; + return VFCAP_OSD | VFCAP_CSP_SUPPORTED; return 0; } |