Changeset 3605 for pjproject/branches/projects/2.0-dev

Timestamp:

Jul 7, 2011 7:12:37 AM (13 years ago)

Author:

bennylp

Message:

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

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -1116 +1116 @@
     PJ_ASSERT_RETURN(s && pval, PJ_EINVAL);
 
+#if SDL_VERSION_ATLEAST(1,3,0)
     if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW)
     {
@@ -1124 +1125 @@
                               &((pjmedia_coord *)pval)->y);
         return PJ_SUCCESS;
-    } else {
-        return PJMEDIA_EVID_INVCAP;
-    }
+    }
+#endif
+
+    return PJMEDIA_EVID_INVCAP;
 }
 
@@ -1140 +1142 @@
     PJ_ASSERT_RETURN(s && pval, PJ_EINVAL);
 
+#if SDL_VERSION_ATLEAST(1,3,0)
     if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
         SDL_SetWindowPosition(strm->window, ((pjmedia_coord *)pval)->x,
@@ -1150 +1153 @@
             SDL_ShowWindow(strm->window);
         return PJ_SUCCESS;
-    } else if (cap == PJMEDIA_VID_DEV_CAP_FORMAT) {
+    } else
+#endif
+    if (cap == PJMEDIA_VID_DEV_CAP_FORMAT) {
         strm->new_fmt = (pjmedia_format *)pval;
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0