diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
commit | fccb0a7e45b61128262a396f2426bd7168fd198c (patch) | |
tree | ac09e6b90d4389717f32181f8b6f3848ffb149fe /libvo/video_out.c | |
parent | 71b25cca7644ab059393e9ee4682d79aab41ceba (diff) | |
parent | ce821bd91f0b0c67b96f5d3b8f3fda19e1015294 (diff) | |
download | mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.bz2 mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.xz |
Merge svn changes up to r28176
Conflicts:
libvo/video_out.c
libvo/x11_common.c
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r-- | libvo/video_out.c | 67 |
1 files changed, 39 insertions, 28 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index e587932959..dfdebf077e 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -49,7 +49,7 @@ char *vo_subdevice = NULL; int vo_directrendering=0; int vo_colorkey = 0x0000ff00; // default colorkey is green - // (0xff000000 means that colorkey has been disabled) + // (0xff000000 means that colorkey has been disabled) // // Externally visible list of all vo drivers @@ -118,10 +118,10 @@ const struct vo_driver *video_out_drivers[] = &video_out_direct3d, #endif #ifdef CONFIG_COREVIDEO - &video_out_macosx, + &video_out_macosx, #endif #ifdef CONFIG_QUARTZ - &video_out_quartz, + &video_out_quartz, #endif #ifdef CONFIG_XMGA &video_out_xmga, @@ -159,26 +159,26 @@ const struct vo_driver *video_out_drivers[] = &video_out_sdl, #endif #ifdef CONFIG_GGI - &video_out_ggi, + &video_out_ggi, #endif #ifdef CONFIG_FBDEV - &video_out_fbdev, - &video_out_fbdev2, + &video_out_fbdev, + &video_out_fbdev2, #endif #ifdef CONFIG_SVGALIB - &video_out_svga, + &video_out_svga, #endif #ifdef CONFIG_AA - &video_out_aa, + &video_out_aa, #endif #ifdef CONFIG_CACA - &video_out_caca, + &video_out_caca, #endif #ifdef CONFIG_DXR2 - &video_out_dxr2, + &video_out_dxr2, #endif #ifdef CONFIG_DXR3 - &video_out_dxr3, + &video_out_dxr3, #endif #ifdef CONFIG_IVTV &video_out_ivtv, @@ -187,56 +187,56 @@ const struct vo_driver *video_out_drivers[] = &video_out_v4l2, #endif #ifdef CONFIG_ZR - &video_out_zr, - &video_out_zr2, + &video_out_zr, + &video_out_zr2, #endif #ifdef CONFIG_BL - &video_out_bl, + &video_out_bl, #endif #ifdef CONFIG_VESA - &video_out_vesa, + &video_out_vesa, #endif #ifdef CONFIG_DIRECTFB - &video_out_directfb, + &video_out_directfb, #endif #ifdef CONFIG_DFBMGA &video_out_dfbmga, #endif #ifdef CONFIG_VIDIX #ifdef CONFIG_X11 - &video_out_xvidix, + &video_out_xvidix, #endif #if defined(__MINGW32__) || defined(__CYGWIN__) - &video_out_winvidix, + &video_out_winvidix, #endif - &video_out_cvidix, + &video_out_cvidix, #endif &video_out_null, - // should not be auto-selected + // should not be auto-selected #ifdef CONFIG_XVMC &video_out_xvmc, #endif - &video_out_mpegpes, + &video_out_mpegpes, #ifdef CONFIG_YUV4MPEG - &video_out_yuv4mpeg, + &video_out_yuv4mpeg, #endif #ifdef CONFIG_PNG - &video_out_png, + &video_out_png, #endif #ifdef CONFIG_JPEG - &video_out_jpeg, + &video_out_jpeg, #endif #ifdef CONFIG_GIF - &video_out_gif89a, + &video_out_gif89a, #endif #ifdef CONFIG_TGA &video_out_tga, #endif #ifdef CONFIG_PNM - &video_out_pnm, + &video_out_pnm, #endif #ifdef CONFIG_MD5SUM - &video_out_md5sum, + &video_out_md5sum, #endif NULL }; @@ -389,7 +389,18 @@ int vo_config(struct vo *vo, uint32_t width, uint32_t height, return ret; } -#if defined(CONFIG_FBDEV)||defined(CONFIG_VESA) +/** + * \brief lookup an integer in a table, table must have 0 as the last key + * \param key key to search for + * \result translation corresponding to key or "to" value of last mapping + * if not found. + */ +int lookup_keymap_table(const struct keymap *map, int key) { + while (map->from && map->from != key) map++; + return map->to; +} + +#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA) /* Borrowed from vo_fbdev.c Monitor ranges related functions*/ |