Merge remote-tracking branch 'wind-upstream/h264encoder0.3' into IVB-camera
authorWind Yuan <feng.yuan@intel.com>
Wed, 18 Jan 2012 11:31:48 +0000 (19:31 +0800)
committerWind Yuan <feng.yuan@intel.com>
Wed, 18 Jan 2012 11:31:48 +0000 (19:31 +0800)
commitcd2ec7fd7e6ce1396b3a154f0c5ec3f8d7ac038f
treeec1fbf07558d8db9c3dcea1d2bbf087e4a115350
parent41fa34fc1f4e0d9150c6af462d8b0dedfff1c26e
parent18f70723198594e99294493450e78cc764fcff26
Merge remote-tracking branch 'wind-upstream/h264encoder0.3' into IVB-camera