Mercurial > mplayer.hg

comparison libvo/video_out.c @ 27365:13c920fdf7f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change a bunch of video-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Sat, 02 Aug 2008 17:38:11 +0000
parents 5cafd67e6c90
children 14c5017f40d2
comparison
equal deleted inserted replaced
27364:4864676b338f 27365:13c920fdf7f5
113 extern vo_functions_t video_out_pnm; 113 extern vo_functions_t video_out_pnm;
114 extern vo_functions_t video_out_md5sum; 114 extern vo_functions_t video_out_md5sum;
115 115
116 const vo_functions_t* const video_out_drivers[] = 116 const vo_functions_t* const video_out_drivers[] =
117 { 117 {
118 #ifdef HAVE_XVR100 118 #ifdef CONFIG_XVR100
119 &video_out_xvr100, 119 &video_out_xvr100,
120 #endif 120 #endif
121 #ifdef HAVE_TDFX_VID 121 #ifdef CONFIG_TDFX_VID
122 &video_out_tdfx_vid, 122 &video_out_tdfx_vid,
123 #endif 123 #endif
124 #ifdef HAVE_DIRECTX 124 #ifdef CONFIG_DIRECTX
125 &video_out_directx, 125 &video_out_directx,
126 #endif 126 #endif
127 #ifdef HAVE_COREVIDEO 127 #ifdef HAVE_COREVIDEO
128 &video_out_macosx, 128 &video_out_macosx,
129 #endif 129 #endif
130 #ifdef HAVE_QUARTZ 130 #ifdef HAVE_QUARTZ
131 &video_out_quartz, 131 &video_out_quartz,
132 #endif 132 #endif
133 #ifdef HAVE_XMGA 133 #ifdef CONFIG_XMGA
134 &video_out_xmga, 134 &video_out_xmga,
135 #endif 135 #endif
136 #ifdef HAVE_MGA 136 #ifdef CONFIG_MGA
137 &video_out_mga, 137 &video_out_mga,
138 #endif 138 #endif
139 #ifdef HAVE_TDFXFB 139 #ifdef CONFIG_TDFXFB
140 &video_out_tdfxfb, 140 &video_out_tdfxfb,
141 #endif 141 #endif
142 #ifdef HAVE_S3FB 142 #ifdef CONFIG_S3FB
143 &video_out_s3fb, 143 &video_out_s3fb,
144 #endif 144 #endif
145 #ifdef HAVE_3DFX 145 #ifdef CONFIG_3DFX
146 &video_out_3dfx, 146 &video_out_3dfx,
147 #endif 147 #endif
148 #ifdef HAVE_XV 148 #ifdef HAVE_XV
149 &video_out_xv, 149 &video_out_xv,
150 #endif 150 #endif
151 #ifdef HAVE_X11 151 #ifdef HAVE_X11
152 &video_out_x11, 152 &video_out_x11,
153 &video_out_xover, 153 &video_out_xover,
154 #endif 154 #endif
155 #ifdef HAVE_GL 155 #ifdef CONFIG_GL
156 &video_out_gl, 156 &video_out_gl,
157 &video_out_gl2, 157 &video_out_gl2,
158 #endif 158 #endif
159 #ifdef HAVE_DGA 159 #ifdef HAVE_DGA
160 &video_out_dga, 160 &video_out_dga,
161 #endif 161 #endif
162 #ifdef HAVE_SDL 162 #ifdef CONFIG_SDL
163 &video_out_sdl, 163 &video_out_sdl,
164 #endif 164 #endif
165 #ifdef HAVE_GGI 165 #ifdef CONFIG_GGI
166 &video_out_ggi, 166 &video_out_ggi,
167 #endif 167 #endif
168 #ifdef HAVE_FBDEV 168 #ifdef CONFIG_FBDEV
169 &video_out_fbdev, 169 &video_out_fbdev,
170 &video_out_fbdev2, 170 &video_out_fbdev2,
171 #endif 171 #endif
172 #ifdef HAVE_SVGALIB 172 #ifdef CONFIG_SVGALIB
173 &video_out_svga, 173 &video_out_svga,
174 #endif 174 #endif
175 #ifdef HAVE_AA 175 #ifdef CONFIG_AA
176 &video_out_aa, 176 &video_out_aa,
177 #endif 177 #endif
178 #ifdef HAVE_CACA 178 #ifdef CONFIG_CACA
179 &video_out_caca, 179 &video_out_caca,
180 #endif 180 #endif
181 #ifdef HAVE_DXR2 181 #ifdef HAVE_DXR2
182 &video_out_dxr2, 182 &video_out_dxr2,
183 #endif 183 #endif
192 #endif 192 #endif
193 #ifdef HAVE_ZR 193 #ifdef HAVE_ZR
194 &video_out_zr, 194 &video_out_zr,
195 &video_out_zr2, 195 &video_out_zr2,
196 #endif 196 #endif
197 #ifdef HAVE_BL 197 #ifdef CONFIG_BL
198 &video_out_bl, 198 &video_out_bl,
199 #endif 199 #endif
200 #ifdef HAVE_VESA 200 #ifdef CONFIG_VESA
201 &video_out_vesa, 201 &video_out_vesa,
202 #endif 202 #endif
203 #ifdef HAVE_DIRECTFB 203 #ifdef CONFIG_DIRECTFB
204 &video_out_directfb, 204 &video_out_directfb,
205 #endif 205 #endif
206 #ifdef HAVE_DFBMGA 206 #ifdef CONFIG_DFBMGA
207 &video_out_dfbmga, 207 &video_out_dfbmga,
208 #endif 208 #endif
209 #ifdef CONFIG_VIDIX 209 #ifdef CONFIG_VIDIX
210 #ifdef HAVE_X11 210 #ifdef HAVE_X11
211 &video_out_xvidix, 211 &video_out_xvidix,
219 // should not be auto-selected 219 // should not be auto-selected
220 #ifdef HAVE_XVMC 220 #ifdef HAVE_XVMC
221 &video_out_xvmc, 221 &video_out_xvmc,
222 #endif 222 #endif
223 &video_out_mpegpes, 223 &video_out_mpegpes,
224 #ifdef HAVE_YUV4MPEG 224 #ifdef CONFIG_YUV4MPEG
225 &video_out_yuv4mpeg, 225 &video_out_yuv4mpeg,
226 #endif 226 #endif
227 #ifdef HAVE_PNG 227 #ifdef HAVE_PNG
228 &video_out_png, 228 &video_out_png,
229 #endif 229 #endif
231 &video_out_jpeg, 231 &video_out_jpeg,
232 #endif 232 #endif
233 #ifdef HAVE_GIF 233 #ifdef HAVE_GIF
234 &video_out_gif89a, 234 &video_out_gif89a,
235 #endif 235 #endif
236 #ifdef HAVE_TGA 236 #ifdef CONFIG_TGA
237 &video_out_tga, 237 &video_out_tga,
238 #endif 238 #endif
239 #ifdef HAVE_PNM 239 #ifdef HAVE_PNM
240 &video_out_pnm, 240 &video_out_pnm,
241 #endif 241 #endif
242 #ifdef HAVE_MD5SUM 242 #ifdef CONFIG_MD5SUM
243 &video_out_md5sum, 243 &video_out_md5sum,
244 #endif 244 #endif
245 NULL 245 NULL
246 }; 246 };
247 247
318 } 318 }
319 319
320 return vo->config(width, height, d_width, d_height, flags, title, format); 320 return vo->config(width, height, d_width, d_height, flags, title, format);
321 } 321 }
322 322
323 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 323 #if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
324 /* Borrowed from vo_fbdev.c 324 /* Borrowed from vo_fbdev.c
325 Monitor ranges related functions*/ 325 Monitor ranges related functions*/
326 326
327 char *monitor_hfreq_str = NULL; 327 char *monitor_hfreq_str = NULL;
328 char *monitor_vfreq_str = NULL; 328 char *monitor_vfreq_str = NULL;