Conflicts: gst-libs/gst/pbutils/gstdiscoverer-types.c gst-libs/gst/pbutils/gstdiscoverer.c tests/check/Makefile.am