Changeset 3605


Ignore:
Timestamp:
Jul 7, 2011 7:12:37 AM (8 years ago)
Author:
bennylp
Message:

Re #1285: fixed compilation error if SDL < 1.3 is used

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

    r3592 r3605  
    11161116    PJ_ASSERT_RETURN(s && pval, PJ_EINVAL); 
    11171117 
     1118#if SDL_VERSION_ATLEAST(1,3,0) 
    11181119    if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) 
    11191120    { 
     
    11241125                              &((pjmedia_coord *)pval)->y); 
    11251126        return PJ_SUCCESS; 
    1126     } else { 
    1127         return PJMEDIA_EVID_INVCAP; 
    1128     } 
     1127    } 
     1128#endif 
     1129 
     1130    return PJMEDIA_EVID_INVCAP; 
    11291131} 
    11301132 
     
    11401142    PJ_ASSERT_RETURN(s && pval, PJ_EINVAL); 
    11411143 
     1144#if SDL_VERSION_ATLEAST(1,3,0) 
    11421145    if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) { 
    11431146        SDL_SetWindowPosition(strm->window, ((pjmedia_coord *)pval)->x, 
     
    11501153            SDL_ShowWindow(strm->window); 
    11511154        return PJ_SUCCESS; 
    1152     } else if (cap == PJMEDIA_VID_DEV_CAP_FORMAT) { 
     1155    } else 
     1156#endif 
     1157    if (cap == PJMEDIA_VID_DEV_CAP_FORMAT) { 
    11531158        strm->new_fmt = (pjmedia_format *)pval; 
    11541159#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0 
Note: See TracChangeset for help on using the changeset viewer.