Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Tue, 1 Jul 2014 15:05:04 +0000 (17:05 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Tue, 1 Jul 2014 15:05:04 +0000 (17:05 +0200)
commit2d53b693e8c0cce8f395bce0cb1817c51db345af
tree4e5736520f0ddeae476c15d1059e789465e9eabd
parent1cd69fd76dc85efdd755853abd11c9ee0ead3fb5
parent6da4dcf85829be95da2a89fc68d884834fdfb3db
Merge branch 'master' into gst-vaapi-branch
gst-libs/gst/codecparsers/gsth264parser.c
gst-libs/gst/codecparsers/gsth264parser.h