* commit '57070b14':
  flashsv: Check diff_start diff_height values

Conflicts:
	libavcodec/flashsv.c

See: 880c73cdMerged-by: Michael Niedermayer <michaelni@gmx.at>