* commit 'bfd26b7c':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
	libavcodec/h264_ps.c

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