Mercurial > mplayer.hg
comparison libvo/vo_gl.c @ 34812:f2274219a79c
Fix -fs with SDL-based vo gl.
author | reimar |
---|---|
date | Mon, 14 May 2012 20:24:43 +0000 |
parents | e48338dbd0cb |
children | ec6877bfc79f |
comparison
equal
deleted
inserted
replaced
34811:57eee2db5fe7 | 34812:f2274219a79c |
---|---|
40 #include "aspect.h" | 40 #include "aspect.h" |
41 #include "fastmemcpy.h" | 41 #include "fastmemcpy.h" |
42 #include "sub/eosd.h" | 42 #include "sub/eosd.h" |
43 | 43 |
44 #ifdef CONFIG_GL_SDL | 44 #ifdef CONFIG_GL_SDL |
45 #ifdef CONFIG_SDL_SDL_H | 45 #include "sdl_common.h" |
46 #include <SDL/SDL.h> | |
47 #else | |
48 #include <SDL.h> | |
49 #endif | |
50 #endif | 46 #endif |
51 | 47 |
52 static const vo_info_t info = | 48 static const vo_info_t info = |
53 { | 49 { |
54 "OpenGL", | 50 "OpenGL", |
657 "gl", title); | 653 "gl", title); |
658 } | 654 } |
659 #endif | 655 #endif |
660 #ifdef CONFIG_GL_SDL | 656 #ifdef CONFIG_GL_SDL |
661 if (glctx.type == GLTYPE_SDL) { | 657 if (glctx.type == GLTYPE_SDL) { |
662 SDL_WM_SetCaption(title, NULL); | 658 if (!vo_sdl_config(d_width, d_height, flags, title)) |
663 vo_dwidth = d_width; | 659 return -1; |
664 vo_dheight = d_height; | |
665 } | 660 } |
666 #endif | 661 #endif |
667 return 0; | 662 return 0; |
668 } | 663 } |
669 | 664 |