Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 14 Jun 2013 08:25:14 +0000 (10:25 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 14 Jun 2013 08:25:14 +0000 (10:25 +0200)
commit770297785dc460b1295c35e65a494ca582eaa355
treec56df06f1f14ef2d43503c1dcb5f2552d7184477
parent500bc02db4c55727d81d153da4e378d2420bedd8
parent023c58ba118fd3c01702e87a38160a272cd3d4a3
Merge branch 'master' into gst-vaapi-branch
gst-libs/gst/codecparsers/gsth264parser.c