Commit 8a705f2f authored by Ryan C. Gordon's avatar Ryan C. Gordon

Memory leak fixes by Bill May.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40430
parent 3c98f857
No related merge requests found
......@@ -395,6 +395,7 @@ SDL_NAME(XvQueryEncodings)(
*p_nEncodings = rep.num_encodings;
*p_pEncodings = pes;
Xfree(buffer);
UnlockDisplay(dpy);
SyncHandle();
......@@ -978,7 +979,6 @@ SDL_NAME(XvImage) * SDL_NAME(XvCreateImage) (
UnlockDisplay(dpy);
SyncHandle();
return ret;
}
......
......@@ -36,6 +36,7 @@ static char rcsid =
#include <sys/shm.h>
#include <X11/extensions/XShm.h>
#include <XFree86/extensions/Xvlib.h>
#include <X11/Xlibint.h>
#include "SDL_error.h"
#include "SDL_video.h"
......@@ -130,6 +131,19 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
}
SDL_NAME(XvFreeAdaptorInfo)(ainfo);
}
/*
* !!! FIXME:
* "Here are some diffs for X11 and yuv. Note that the last part 2nd
* diff should probably be a new call to XvQueryAdaptorFree with ainfo
* and the number of adaptors, instead of the loop through like I did."
*/
for ( i=0; i < adaptors; ++i ) {
if (ainfo[i].name != NULL) Xfree(ainfo[i].name);
if (ainfo[i].formats != NULL) Xfree(ainfo[i].formats);
}
Xfree(ainfo);
if ( xv_port == -1 ) {
SDL_SetError("No available video ports for requested format");
return(NULL);
......
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