mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-26 17:18:15 +00:00
Merge branch 'master' into 0.11
Conflicts: gst/gstpad.c
This commit is contained in:
commit
97560eb9cb
Conflicts: gst/gstpad.c