mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-05 02:02:26 +00:00
Merge branch 'master' into 0.11
Conflicts: gst/gstpad.c
This commit is contained in:
commit
97560eb9cb
Conflicts: gst/gstpad.c