* commit '3e3056f2':
  h264: Allow stream and container cropping at the same time

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