OSDN Git Service

(root) / android-x86 / hardware-intel-common-vaapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbe582c 76c2fb8)
Merge branch 'v1.8-branch' into 01org--master
authorXiang, Haihao <haihao.xiang@intel.com>
Wed, 19 Apr 2017 05:11:49 +0000 (13:11 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Wed, 19 Apr 2017 05:11:49 +0000 (13:11 +0800)
Conflicts:
configure.ac
src/gen9_avc_const_def.c
src/gen9_avc_encoder.c
src/gen9_avc_encoder.h
src/gen9_avc_encoder_kernels.c
src/gen9_vme.c
src/i965_avc_encoder_common.h
src/i965_drv_video.c
src/i965_encoder.c
src/i965_encoder_common.h


Trivial merge
hardware/intel/common/vaapi
About OSDN
Find Software
Develop Software
Help