adapter: remove _try_to_merge_up()
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 1 May 2012 08:50:32 +0000 (10:50 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 1 May 2012 08:50:32 +0000 (10:50 +0200)
commit1b87a07d8e513b2e72a675eb5c101f6cdf666146
tree7e8c87c044e604cb911652f1fdc09a86a408d426
parentaad3812633e414ffab75e6af9a37f86f5a0a26fd
adapter: remove _try_to_merge_up()

It causes the timestamp to go wrong, should not cause much of a performance
increase and in the cases where it is faster, it is broken in 0.10 as well.
We should try to review this when rewriting the adapter for 0.11 memory
features.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674791
libs/gst/base/gstadapter.c
tests/check/libs/adapter.c