Fixes: CID1396263
Fixes: CID1396271
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 03ce71e4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>