Fixes: Ticket6546

Regression since: 54aaadf6Reviewed-by: Muhammad Faiz <mfcc64@gmail.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 47c93657)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>