-
Mark Nauwelaerts authored
Conflicts: ext/wavpack/gstwavpackparse.c sys/v4l2/gstv4l2bufferpool.c sys/v4l2/gstv4l2bufferpool.h sys/v4l2/gstv4l2videooverlay.c
26dd999b
Conflicts: ext/wavpack/gstwavpackparse.c sys/v4l2/gstv4l2bufferpool.c sys/v4l2/gstv4l2bufferpool.h sys/v4l2/gstv4l2videooverlay.c