[MPlayer-cvslog] r36569 - trunk/libvo/vo_xvmc.c

[iive]

Author: iive
Date: Mon Jan  6 20:55:26 2014
New Revision: 36569

Log:
XvMC: Minor refoactoring of allocate_xvimage().

Modified:
   trunk/libvo/vo_xvmc.c

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Thu Jan  2 10:16:57 2014	(r36568)
+++ trunk/libvo/vo_xvmc.c	Mon Jan  6 20:55:26 2014	(r36569)
@@ -184,8 +184,8 @@ static int in_use(struct xvmc_render *cu
 static void allocate_xvimage(int xvimage_width,int xvimage_height,int xv_format)
 {
  /*
-  * allocate XvImages.  FIXME: no error checking, without
-  * mit-shm this will bomb... trzing to fix ::atmos
+  * allocate XvImages.
+  * FIXME: no error checking
   */
 #ifdef HAVE_SHM
     if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1;
@@ -207,14 +207,12 @@ static void allocate_xvimage(int xvimage
         XShmAttach(mDisplay, &Shminfo);
         XSync(mDisplay, False);
         shmctl(Shminfo.shmid, IPC_RMID, 0);
+        return;
     }
-    else
 #endif
-    {
-        xvimage = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, xvimage_width, xvimage_height);
-        xvimage->data = malloc(xvimage->data_size);
-        XSync(mDisplay,False);
-    }
+    xvimage = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, xvimage_width, xvimage_height);
+    xvimage->data = malloc(xvimage->data_size);
+    XSync(mDisplay,False);
 // memset(xvimage->data,128,xvimage->data_size);
     return;
 }