* commit '8e373fe0':
  hevc: Factor out the pixel format mapping from the sps parser

Conflicts:
	libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>