This simplifies the management of current_sps
Fixes Ticket3458
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 880dbe43)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>