Fixes Ticket4611
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1050d99)

Conflicts:

	ffmpeg.c