Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 5 Jul 2013 15:44:49 +0000 (17:44 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 5 Jul 2013 15:44:49 +0000 (17:44 +0200)
commit0e44e0902fe9cc4e97fb926e823e44902ccbf79f
treee0274e9668de5f2bc96d3094f21dcec61db32ccf
parent843ce3e0041b37cde3349ca285918c145d66d0d0
parentc0fd6522b596a6ea8df20178a3cf5bbcfa8a4044
Merge branch 'master' into gst-vaapi-branch
gst-libs/gst/codecparsers/gsth264parser.c