* commit 'd8a45d2d':
  h264_ps: properly check cropping parameters against overflow

Conflicts:
	libavcodec/h264_ps.c

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