It probably also fixes a memleak or two.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c34461b3)