* commit '3fbad007':
  utvideoenc: Enable support for multiple slices and use them

Conflicts:
	libavcodec/utvideoenc.c
	tests/fate/utvideo.mak

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