diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2016-09-19 14:15:32 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2016-09-19 14:15:32 +0800 |
| commit | 97486f64e2eabb0a3bf57bba853c109dae2f4a1b (patch) | |
| tree | d12d2c6a75e50eaf1c45d2883d660ba343bdfd0a /TESTING | |
| parent | 36fbd817428d3a257f59bb1ca28ed491c3981616 (diff) | |
| parent | 32c6a553cb40105bada83f3695b9f8ed615f2134 (diff) | |
| download | libva-intel-driver-97486f64e2eabb0a3bf57bba853c109dae2f4a1b.tar.gz | |
Merge branch 'v1.7-branch' into fdo--master
Conflicts:
configure.ac
src/gen6_mfc_common.c
src/gen75_vme.c
src/gen7_vme.c
src/gen8_mfc.c
src/gen8_vme.c
src/gen9_mfc.c
src/gen9_vme.c
src/i965_drv_video.c
src/i965_encoder.c
src/i965_encoder.h
Diffstat (limited to 'TESTING')
0 files changed, 0 insertions, 0 deletions