Workaround for ticket #4287.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7b1c03aa)

Conflicts:
	libavcodec/libx264.c