This makes the sample from Ticket4560 behave consistently with either branch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>