diff options
| author | Austin Yuan <shengquan.yuan@gmail.com> | 2010-12-21 18:47:17 +0800 |
|---|---|---|
| committer | Austin Yuan <shengquan.yuan@gmail.com> | 2010-12-21 18:47:17 +0800 |
| commit | 8f056b1c0bd0dac3c57193d30506730218740c70 (patch) | |
| tree | 6e7a7522479037c2c622c8e462183521196a7104 | |
| parent | 67968b9001a0923dbdf582c2c16338de431d7086 (diff) | |
| parent | 1d2c38771fa787d68a83ad0dfbf014b11296b5ee (diff) | |
Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | i965_drv_video/i965_avc_ildb.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ce0e8ea..7ae538d 100644 --- a/configure.ac +++ b/configure.ac @@ -104,9 +104,9 @@ PKG_CHECK_MODULES([DRM], [libdrm]) PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.1], [gen4asm=yes], [gen4asm=no]) AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) -# Check for libdrm >= 2.4.21 (needed for i965_drv_video.so) -if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4.21 libdrm; then - AC_MSG_WARN([libdrm < 2.4.21 found, disabling build of i965 video driver]) +# Check for libdrm >= 2.4.23 (needed for i965_drv_video.so) +if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4.23 libdrm; then + AC_MSG_WARN([libdrm < 2.4.23 found, disabling build of i965 video driver]) enable_i965_driver=no fi AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes) diff --git a/i965_drv_video/i965_avc_ildb.c b/i965_drv_video/i965_avc_ildb.c index a053062..a6be42b 100644 --- a/i965_drv_video/i965_avc_ildb.c +++ b/i965_drv_video/i965_avc_ildb.c @@ -360,7 +360,7 @@ i965_avc_ildb_upload_constants(VADriverContextP ctx, struct decode_state *decode if (IS_IRONLAKE(i965->intel.device_id)) { root_input->max_concurrent_threads = 76; /* 72 - 2 + 8 - 2 */ } else { - root_input->max_concurrent_threads = 54; /* 50 - 2 + 8 = 2 */ + root_input->max_concurrent_threads = 54; /* 50 - 2 + 8 - 2 */ } if (pic_param->pic_fields.bits.field_pic_flag) |