Merge branch 'master' into mrst-video

diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index 04e9e37..3ba1ee9 100644 (file)
--- a/dummy_drv_video/dummy_drv_video.c
+++ b/dummy_drv_video/dummy_drv_video.c
@@ -1199,7 +1199,7 @@ VAStatus dummy_Terminate( VADriverContextP ctx )
     return VA_STATUS_SUCCESS;
 }
 
-VAStatus __vaDriverInit_0_28(  VADriverContextP ctx )
+VAStatus __vaDriverInit_0_29(  VADriverContextP ctx )
 {
     object_base_p obj;
     int result;
@@ -1207,7 +1207,7 @@ VAStatus __vaDriverInit_0_28(  VADriverContextP ctx )
     int i;
 
     ctx->version_major = 0;
-    ctx->version_minor = 28;
+    ctx->version_minor = 29;
     ctx->max_profiles = DUMMY_MAX_PROFILES;
     ctx->max_entrypoints = DUMMY_MAX_ENTRYPOINTS;
     ctx->max_attributes = DUMMY_MAX_CONFIG_ATTRIBUTES;

diff --git a/test/mpeg2-I.jpg b/test/mpeg2-I.jpg
new file mode 100755 (executable)
index 0000000..f5a6c50
Binary files /dev/null and b/test/mpeg2-I.jpg differ

diff --git a/test/mpeg2-I.mpg b/test/mpeg2-I.mpg
new file mode 100644 (file)
index 0000000..f00fa01
Binary files /dev/null and b/test/mpeg2-I.mpg differ

diff --git a/test/test_12.c b/test/test_12.c
index dcc7021..070d45c 100644 (file)
--- a/test/test_12.c
+++ b/test/test_12.c
@@ -228,12 +228,10 @@ void test()
     XMapWindow(dpy, win);
     XSync(dpy, False);
 
-#if 0
     va_status = vaPutSurface(va_dpy, vaSurface, win,
                             0,0,surf_width,surf_height,
                             0,0,win_width,win_height,
                             NULL,0,0);
-#endif
     ASSERT( VA_STATUS_SUCCESS == va_status );
 
     printf("press any key to exit\n");