Merge branch 'snb-encoder'
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 26 Apr 2011 08:10:22 +0000 (16:10 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 26 Apr 2011 08:10:22 +0000 (16:10 +0800)
1  2 
i965_drv_video/i965_drv_video.c

Simple merge