Merge branch 'bee-jpeg' into IVB-camera
authorWind Yuan <feng.yuan@intel.com>
Thu, 9 Feb 2012 11:58:53 +0000 (19:58 +0800)
committerWind Yuan <feng.yuan@intel.com>
Thu, 9 Feb 2012 11:58:53 +0000 (19:58 +0800)
commitb9d13f04ee271d1fa74d86125252ac93e5f9341c
tree14c6c030addd0ed91528728296b58f9d56b2010f
parentf00c34b63c649956b68defdc9bf89f9ca2fbd1e7
parent545a8643516e4421461f22c7fb6d52ef936b21d4
Merge branch 'bee-jpeg' into IVB-camera
gst-libs/gst/vaapi/gstvaapidecoder_jpeg.c