Merge branch 'vaapi-ext' into staging-work
authorXiang, Haihao <haihao.xiang@intel.com>
Fri, 16 Mar 2012 05:28:01 +0000 (13:28 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Fri, 16 Mar 2012 05:28:01 +0000 (13:28 +0800)
commit4f580b386bc1e8128d14a58b8e8bfe5495b4fd21
tree5f1b227fa90edbef2d4d8d071a6a5706ff8094ee
parent62863ae9809cecd11bdc29656a1fa1e1c9405e47
parent5d56bdbe9eca11138fe63d00f970cc857e82cca2
Merge branch 'vaapi-ext' into staging-work

Conflicts:
src/gen6_mfc.c
src/gen6_mfc.c