Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Mon, 9 Dec 2013 10:39:53 +0000 (11:39 +0100)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Mon, 9 Dec 2013 10:40:20 +0000 (11:40 +0100)
commit2bc30da5a443748b918b6b40cd27751b9d1ff430
tree46ba3277bfd80dd4f99fbc337d41ee7f8d72e26e
parentb33bd3214e9780d75719099a7e32fa59a286541e
parentfb04e48f28b81f60aa71fb28797919afb05ab4e0
Merge branch 'master' into gst-vaapi-branch
gst-libs/gst/codecparsers/Makefile.am
gst-libs/gst/codecparsers/gsth264parser.c