Mercurial > mplayer.hg
comparison libmpcodecs/vf_vo.c @ 21161:ad7747bce52d
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.
author | uau |
---|---|
date | Wed, 22 Nov 2006 19:21:16 +0000 |
parents | c0bcec5150a3 |
children | c37fae0e2b5a |
comparison
equal
deleted
inserted
replaced
21160:d2295c85cbdc | 21161:ad7747bce52d |
---|---|
86 { | 86 { |
87 if(!video_out) return CONTROL_FALSE; // vo not configured? | 87 if(!video_out) return CONTROL_FALSE; // vo not configured? |
88 return(video_out->control(VOCTRL_SET_DEINTERLACE, data) | 88 return(video_out->control(VOCTRL_SET_DEINTERLACE, data) |
89 == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; | 89 == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; |
90 } | 90 } |
91 #ifdef USE_OSD | |
92 case VFCTRL_DRAW_OSD: | 91 case VFCTRL_DRAW_OSD: |
93 if(!vo_config_count) return CONTROL_FALSE; // vo not configured? | 92 if(!vo_config_count) return CONTROL_FALSE; // vo not configured? |
94 video_out->draw_osd(); | 93 video_out->draw_osd(); |
95 return CONTROL_TRUE; | 94 return CONTROL_TRUE; |
96 #endif | |
97 case VFCTRL_FLIP_PAGE: | 95 case VFCTRL_FLIP_PAGE: |
98 { | 96 { |
99 if(!vo_config_count) return CONTROL_FALSE; // vo not configured? | 97 if(!vo_config_count) return CONTROL_FALSE; // vo not configured? |
100 video_out->flip_page(); | 98 video_out->flip_page(); |
101 return CONTROL_TRUE; | 99 return CONTROL_TRUE; |