Merge branch 'fdva-master'

4 files changed, 13 insertions, 13 deletions

diff --git a/libva-x11.pc.in b/libva-x11.pc.in
index 75e4f0b..6dde07f 100644
--- a/libva-x11.pc.in
+++ b/libva-x11.pc.in
@@ -6,6 +6,7 @@ display=x11
 
 Name: libva-${display}
 Description: Userspace Video Acceleration (VA) ${display} interface
+Requires: libva
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lva-${display}
 Cflags: -I${includedir}
diff --git a/test/Makefile.am b/test/Makefile.am
index d7e1b1f..321c822 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,8 +26,8 @@ bin_PROGRAMS = vainfo
 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
 
 
-vainfo_LDADD = $(top_srcdir)/va/$(libvabackendlib)
-vainfo_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib)
+vainfo_LDADD = $(top_builddir)/va/libva.la $(top_srcdir)/va/$(libvabackendlib)
+vainfo_DEPENDENCIES =  $(top_builddir)/va/libva.la $(top_srcdir)/va/$(libvabackendlib)
 vainfo_SOURCES = vainfo.c
 
 SUBDIRS = basic decode encode putsurface
diff --git a/va/va.c b/va/va.c
index 1632e55..2d277e7 100644
--- a/va/va.c
+++ b/va/va.c
@@ -135,10 +135,6 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
     {
         /* don't allow setuid apps to use LIBVA_DRIVERS_PATH */
         search_path = getenv("LIBVA_DRIVERS_PATH");
-        if (!search_path)
-        {
-            search_path = getenv("LIBGL_DRIVERS_PATH");
-        }
     }
     if (!search_path)
     {
@@ -712,12 +708,14 @@ VAStatus vaEndPicture (
     VAContextID context
 )
 {
+  VAStatus va_status;
   VADriverContextP ctx;
   CHECK_DISPLAY(dpy);
   ctx = CTX(dpy);
 
+  va_status = ctx->vtable.vaEndPicture( ctx, context );
   VA_TRACE(va_TraceEndPicture, dpy, context);
-  return ctx->vtable.vaEndPicture( ctx, context );
+  return va_status;
 }
 
 VAStatus vaSyncSurface (
diff --git a/va/va_trace.c b/va/va_trace.c
index dbd0749..1713f27 100644
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -195,14 +195,14 @@ static int va_TraceVABuffers(
                              )
 {
     int i;
-    char *p = pbuf;
+    unsigned char *p = pbuf;
     unsigned int *pi = (unsigned int *)pbuf;
 
     va_TraceMsg("***Buffer Data***");
     for (i=0; i<size; i++) {
         if ((i%16) == 0)
             va_TraceMsg("\n0x%08x:", i);
-        va_TraceMsg("%08x ", p[i]);
+        va_TraceMsg(" %02x", p[i]);
     }
 
     va_TraceMsg("\n");
@@ -1078,18 +1078,19 @@ int va_TraceEndPicture(
     va_TraceMsg("\tchroma_u_offset=%d\n", chroma_u_offset);
     va_TraceMsg("\tchroma_v_offset=%d\n", chroma_v_offset);
 
-    va_TraceMsg("**Y data**\n");
+    if (!buffer)
+        return;
 
     Y_data = buffer;
     UV_data = buffer + luma_offset;
 
     tmp = Y_data;
-    
+    va_TraceMsg("**Y data**\n");
     for (i=0; i<trace_height; i++) {
         for (j=0; j<trace_width; j++) {
             if ((j%16) == 0)
                 va_TraceMsg("\n0x%08x:", j + i*trace_width);
-            va_TraceMsg("%08x ", tmp[j]);
+            va_TraceMsg(" %02x", tmp[j]);
         }
 
         va_TraceMsg("\n");
@@ -1104,7 +1105,7 @@ int va_TraceEndPicture(
             for (j=0; j<trace_width; j++) {
                 if ((j%16) == 0)
                     va_TraceMsg("\n0x%08x:", j + i*trace_width);
-                va_TraceMsg("%08x ", tmp[j]);
+                va_TraceMsg(" %02x", tmp[j]);
             }
 
             va_TraceMsg("\n");