Restores carefully the old behaviour
(and does not break decoding avi samples).
Fixes Ticket2536
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>