Merge branch 'master' into vaapi-ext
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 14 Feb 2012 05:56:05 +0000 (13:56 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 14 Feb 2012 05:56:05 +0000 (13:56 +0800)
commitd0cf73ad1dc66a8fa5911acb837c08604cc51940
treeebe5be859071b24b496e10f0bff781220ecb45a3
parent8e95c67fd8aa6e15f40dda8d5d0179bdcf1af680
parent54293d98004c829615fb9637bef40c81f9ac9da4
Merge branch 'master' into vaapi-ext

Conflicts:
src/gen6_mfc.c
src/gen7_mfd.c
src/gen7_mfd.h
src/i965_drv_video.c
src/i965_drv_video.h
src/i965_encoder.c
src/i965_post_processing.c

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
src/Makefile.am
src/gen6_mfc.c
src/gen6_mfd.c
src/gen7_mfd.c
src/i965_drv_video.c