adapter: fix _try_to_merge_up
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Thu, 27 May 2010 10:50:22 +0000 (12:50 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Thu, 27 May 2010 12:57:29 +0000 (14:57 +0200)
commitaa8b8b57d78808b88229db115896cae69ef7ec3a
tree4ac680fd43811d8f03dc3262a29345db3d925b36
parent7479b64a2a1eeac90b8433d7a707448caf86dfcb
adapter: fix _try_to_merge_up

That is, provide correct return value (as documented), and actually
loop to consider more than the first 2 buffers.
libs/gst/base/gstadapter.c