Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 189420cb)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>