Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 13 Jun 2014 09:30:00 +0000 (11:30 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 13 Jun 2014 09:30:00 +0000 (11:30 +0200)
commitd6325ac0f17df46140355d3a43e54319e7bb2e36
tree793fade88611d41f2e7d22c848ce2b7c459f8616
parent2f587887213b08efbd892c15f481c8a515229406
parent71ed170258670ad2ca85af593d5fd908b647511e
Merge branch 'master' into gst-vaapi-branch