The fixes were pointed out by Diego.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0cad24ce)