* commit '4cfbeef3':
  h264: factor hwaccel pixel formats list

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