Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Wed, 6 Feb 2013 14:18:38 +0000 (15:18 +0100)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Wed, 6 Feb 2013 14:18:38 +0000 (15:18 +0100)
commit31b1c57d44ac1228e4bfede2a924eb8d5f8e76fc
treebb816d5a50b345d024d2ea7db0155fdebf1d1fc3
parente6f102553df1ba7dc5fd1f69b0fd76f7af717f2b
parent308c4fc5e91be8b7ef1f1a988d57d4798676a808
Merge branch 'master' into gst-vaapi-branch