Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Thu, 26 Jun 2014 15:39:17 +0000 (17:39 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Thu, 26 Jun 2014 15:39:17 +0000 (17:39 +0200)
commit1cd69fd76dc85efdd755853abd11c9ee0ead3fb5
tree015ea6e1507cfbd9a9f218c4aadc30906e561512
parentd6325ac0f17df46140355d3a43e54319e7bb2e36
parentc705604e30eab5556e76bc530714ca0ce137af2f
Merge branch 'master' into gst-vaapi-branch
gst-libs/gst/codecparsers/gsth264parser.h