* commit '614b9e4d':
  h264: use avpriv_request_sample for chroma_format_idc

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