Commit 4be1dcdd authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40660
parent d28eb3b3
...@@ -85,10 +85,11 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S ...@@ -85,10 +85,11 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
RootWindow(GFX_Display, SDL_Screen), RootWindow(GFX_Display, SDL_Screen),
&adaptors, &ainfo)) ) { &adaptors, &ainfo)) ) {
#ifdef USE_LAST_ADAPTOR #ifdef USE_LAST_ADAPTOR
for ( i=0; i < adaptors; ++i ) { for ( i=0; i < adaptors; ++i )
#else #else
for ( i=0; (i < adaptors) && (xv_port == -1); ++i ) { for ( i=0; (i < adaptors) && (xv_port == -1); ++i )
#endif /* USE_LAST_ADAPTOR */ #endif /* USE_LAST_ADAPTOR */
{
/* Check to see if the visual can be used */ /* Check to see if the visual can be used */
if ( BUGGY_XFREE86(<=, 4001) ) { if ( BUGGY_XFREE86(<=, 4001) ) {
int visual_ok = 0; int visual_ok = 0;
...@@ -110,10 +111,11 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S ...@@ -110,10 +111,11 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
formats = SDL_NAME(XvListImageFormats)(GFX_Display, formats = SDL_NAME(XvListImageFormats)(GFX_Display,
ainfo[i].base_id, &num_formats); ainfo[i].base_id, &num_formats);
#ifdef USE_LAST_ADAPTOR #ifdef USE_LAST_ADAPTOR
for ( j=0; j < num_formats; ++j ) { for ( j=0; j < num_formats; ++j )
#else #else
for ( j=0; (j < num_formats) && (xv_port == -1); ++j ) { for ( j=0; (j < num_formats) && (xv_port == -1); ++j )
#endif /* USE_LAST_ADAPTOR */ #endif /* USE_LAST_ADAPTOR */
{
if ( (Uint32)formats[j].id == format ) { if ( (Uint32)formats[j].id == format ) {
for ( k=0; k < ainfo[i].num_ports; ++k ) { for ( k=0; k < ainfo[i].num_ports; ++k ) {
if ( Success == SDL_NAME(XvGrabPort)(GFX_Display, ainfo[i].base_id+k, CurrentTime) ) { if ( Success == SDL_NAME(XvGrabPort)(GFX_Display, ainfo[i].base_id+k, CurrentTime) ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment