Remove the subbuffer from X11 sinks and use the private pointer to store a single buffer metadata with the extra info.