* commit 'e87f5e4e':
  h264: fully check cropping amount from sps

Conflicts:
	libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>