diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libxvmc/Makefile.am | 6 | ||||
| -rw-r--r-- | libxvmc/viaXvMC.c | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 2cbe93ea8bd2..ce6a57f0c144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-05-18 Xavier Bachelot <xavier-at-bachelot-dot-org> + + * libxvmc/Makefile.am: + * libxvmc/viaXvMC.c: (XvMCCreateContext): + + Backport 2 fixes from Xorg tree. + http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-via.git;a=commit;h=362e03a38682bfcf366242c53444fa36b6052794 + http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-via.git;a=commit;h=3cd7dac2b5a1c4bfb66bd1b67904d72dc08cbd0e + 2007-04-14 Benno Schulenberg <bensberg-at-justemail-dot-net> * unichrome/via_id.c: (ViaDoubleCheckCLE266Revision), diff --git a/libxvmc/Makefile.am b/libxvmc/Makefile.am index ade6979c47a2..6d608ab689c1 100644 --- a/libxvmc/Makefile.am +++ b/libxvmc/Makefile.am @@ -25,10 +25,12 @@ libviaXvMCPro_la_SOURCES = \ vldXvMC.h libviaXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/unichrome -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0 -libviaXvMC_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0 +libviaXvMC_la_LDFLAGS = -version-number 1:0:0 +libviaXvMC_la_LIBADD = @DRI_LIBS@ libviaXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/unichrome -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0 -libviaXvMCPro_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0 +libviaXvMCPro_la_LDFLAGS = -version-number 1:0:0 +libviaXvMCPro_la_LIBADD = @DRI_LIBS@ else EXTRA_DIST = \ driDrawable.c \ diff --git a/libxvmc/viaXvMC.c b/libxvmc/viaXvMC.c index 1442606e0e6a..bf4692c97c3a 100644 --- a/libxvmc/viaXvMC.c +++ b/libxvmc/viaXvMC.c @@ -376,6 +376,7 @@ XvMCCreateContext(Display * display, XvPortID port, */ XFree(priv_data); + priv_data = NULL; /* * Check for direct rendering capable, establish DRI and DRM connections, @@ -445,7 +446,6 @@ XvMCCreateContext(Display * display, XvPortID port, XUnlockDisplay(display); fprintf(stderr, "viaXvMC: X server did not allow DRI. Check permissions.\n"); - XFree(priv_data); return releaseContextResources(display, context, 1, BadAlloc); } XUnlockDisplay(display); |