Skip to content
Snippets Groups Projects
Commit d8f66267 authored by deuce's avatar deuce
Browse files

Fix for last commit.

parent 66642119
No related branches found
No related tags found
No related merge requests found
......@@ -606,7 +606,7 @@ int sdl_init(int mode)
}
#if (SDL_MAJOR_VERSION > 1) || (SDL_MINOR_VERSION > 2) || (SDL_PATCHLEVEL > 9)
if(yuv.enabled) {
SDL_version linked=sdl.LinkedVersion();
const SDL_version *linked=sdl.Linked_Version();
if(linked->major > 1 || linked->minor > 2 || linked->patch > 9) {
yuv.screen_width=sdl.initial_videoinfo.current_w;
yuv.screen_height=sdl.initial_videoinfo.current_h;
......
......@@ -89,6 +89,7 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
sdlf->LockYUVOverlay=SDL_LockYUVOverlay;
sdlf->UnlockYUVOverlay=SDL_UnlockYUVOverlay;
sdlf->GetVideoInfo=SDL_GetVideoInfo;
sdlf->Linked_Version=SDL_Linked_Version;
sdlf->gotfuncs=1;
sdl_funcs_loaded=1;
return(0);
......@@ -320,6 +321,10 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
FreeLibrary(sdl_dll);
return(-1);
}
if((sdlf->Linked_Version=(void *)GetProcAddress(sdl_dll, "SDL_Linked_Version"))==NULL) {
FreeLibrary(sdl_dll);
return(-1);
}
sdlf->gotfuncs=1;
sdl_funcs_loaded=1;
......@@ -546,6 +551,10 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
dlclose(sdl_dll);
return(-1);
}
if((sdlf->Linked_Version=dlsym(sdl_dll, "SDL_Linked_Version"))==NULL) {
dlclose(sdl_dll);
return(-1);
}
sdlf->gotfuncs=1;
sdl_funcs_loaded=1;
return(0);
......
......@@ -63,6 +63,7 @@ struct sdlfuncs {
int (*LockYUVOverlay) (SDL_Overlay *overlay);
void (*UnlockYUVOverlay) (SDL_Overlay *overlay);
const SDL_VideoInfo *(*GetVideoInfo)(void);
const SDL_version *(*Linked_Version)(void);
SDL_VideoInfo initial_videoinfo;
int gotfuncs;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment