Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 13 Jun 2014 09:06:39 +0000 (11:06 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 13 Jun 2014 09:06:39 +0000 (11:06 +0200)
commit2c962fa6ec145ae038bc11c6f4b55e56879dc29e
tree0a566e5f3b565efda5e025471267d366743bbc2a
parenteaa3f7e72c4e9d8d6ae83b354942d1fcf46aef49
parent7c71423f7d79310e9f6f1d4ae920e330ad0859a7
Merge branch 'master' into gst-vaapi-branch
gst-libs/gst/codecparsers/gsth264parser.c
gst-libs/gst/codecparsers/gsth264parser.h