diff options
| author | Austin Yuan <shengquan.yuan@gmail.com> | 2010-06-17 09:57:00 +0800 |
|---|---|---|
| committer | Austin Yuan <shengquan.yuan@gmail.com> | 2010-06-17 09:57:00 +0800 |
| commit | 4ff4b0db9706d6205e9d16f2f1b04dac9c75ed72 (patch) | |
| tree | 7e4bed91a30f00c355553a514fc00db0aeffdd25 | |
| parent | a450f22b7033169ea2761bf32648a3db8daa90e8 (diff) | |
| parent | 58d7059760f6f733c4af56cc6710e14211d07407 (diff) | |
| download | libva-4ff4b0db9706d6205e9d16f2f1b04dac9c75ed72.tar.gz | |
Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva20100701_5.3.0.001320100621_5.3.0.001120100612_5.3.0.0012
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | i965_drv_video/i965_avc_ildb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 17fc222..fce164c 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ m4_define([libva_version], [libva_major_version.libva_minor_version.libva_micro_version]) # if the library source code has changed, increment revision -m4_define([libva_lt_revision], [2]) +m4_define([libva_lt_revision], [3]) # if any interface was added/removed/changed, then inc current, reset revision m4_define([libva_lt_current], [1]) # if any interface was added since last public release, then increment age diff --git a/i965_drv_video/i965_avc_ildb.c b/i965_drv_video/i965_avc_ildb.c index 9cdfc53..a053062 100644 --- a/i965_drv_video/i965_avc_ildb.c +++ b/i965_drv_video/i965_avc_ildb.c @@ -283,7 +283,7 @@ i965_avc_ildb_interface_descriptor_table(VADriverContextP ctx) for (i = 0; i < NUM_AVC_ILDB_INTERFACES; i++) { int kernel_offset = avc_ildb_kernel_offset[i]; memset(desc, 0, sizeof(*desc)); - desc->desc0.grf_reg_blocks = 9; + desc->desc0.grf_reg_blocks = 7; desc->desc0.kernel_start_pointer = (h264_avc_kernels[H264_AVC_COMBINED].bo->offset + kernel_offset) >> 6; /* reloc */ desc->desc1.const_urb_entry_read_offset = 0; desc->desc1.const_urb_entry_read_len = ((i == AVC_ILDB_ROOT_Y_ILDB_FRAME || |