mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

Align image data pointer, this is also in preparation of an upcoming patch

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21601 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-12 19:03:57 +00:00
parent fa9a9cb0e3
commit ba288eb9b0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvo/vo_x11.c
View File

@ -67,6 +67,8 @@ static void (*draw_alpha_fnc) (int x0, int y0, int w, int h,
/* local data */
static unsigned char *ImageData;
//! original unaligned pointer for free
static unsigned char *ImageDataOrig;
/* X11 related variables */
static XImage *myximage = NULL;
@ -231,7 +233,8 @@ static void getMyXImage(void)
#endif
myximage = XCreateImage(mDisplay, vinfo.visual, depth, ZPixmap,
0, NULL, image_width, image_height, 8, 0);
myximage->data = malloc(myximage->bytes_per_line * image_height);
ImageDataOrig = malloc(myximage->bytes_per_line * image_height + 32);
myximage->data = ImageDataOrig + 16 - ((long)ImageDataOrig & 15);
memset(myximage->data, 0, myximage->bytes_per_line * image_height);
ImageData = myximage->data;
#ifdef HAVE_SHM
@ -250,7 +253,9 @@ static void freeMyXImage(void)
} else
#endif
{
myximage->data = ImageDataOrig;
XDestroyImage(myximage);
ImageDataOrig = NULL;
}
myximage = NULL;
ImageData = NULL;