Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 25 Jan 2013 09:30:15 +0000 (10:30 +0100)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 25 Jan 2013 09:30:15 +0000 (10:30 +0100)
commit35053b8dd905f42f14002f3c14cf8d102016032b
tree131248c85210e3cb6c203333565b2aa53ced6bcd
parent21a098e46204048fe4daf190655f76ea9c6bb76e
parenta1fbd19fe028fc4790be0c6253adf84284b2c9fc
Merge branch 'master' into gst-vaapi-branch
TAG