diff options
| author | Carl Worth <cworth@cworth.org> | 2008-07-17 00:38:54 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2008-07-17 00:38:54 -0700 |
| commit | a6ad50402cb879b08de95f94959bb1f59701c1ff (patch) | |
| tree | 9ee9fc89a52d8791b272721a910ea5c11d4e4aa7 /src/xvmc/I810XvMC.c | |
| parent | e9916b9d496fd0b4df717892dda33f81a2e2990a (diff) | |
| parent | c4565a9811487402d899d0933cc63e27ffe1ff08 (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
configure.ac
src/reg_dumper/Makefile.am
Diffstat (limited to 'src/xvmc/I810XvMC.c')
| -rw-r--r-- | src/xvmc/I810XvMC.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c index 03be2514..ce5395ac 100644 --- a/src/xvmc/I810XvMC.c +++ b/src/xvmc/I810XvMC.c @@ -130,7 +130,6 @@ Status XvMCCreateContext(Display *display, XvPortID port, int surface_type_id, int width, int height, int flags, XvMCContext *context) { i810XvMCContext *pI810XvMC; - char busIdString[10]; int priv_count; uint *priv_data; uint magic; @@ -217,7 +216,6 @@ Status XvMCCreateContext(Display *display, XvPortID port, /* Open DRI Device */ if((pI810XvMC->fd = drmOpen("i810",NULL)) < 0) { printf("DRM Device for i810 could not be opened.\n"); - free(busIdString); free(pI810XvMC); return BadAccess; } /* !pI810XvMC->fd */ |