Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'

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

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

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

libavcodec/utvideoenc.c

@@ -207,11 +207,10 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx)
     if (!avctx->slices) {
         c->slices = subsampled_height / 120;
 
-        if (!c->slices) {
+        if (!c->slices)
             c->slices = 1;
-        } else if (c->slices > 256) {
+        else if (c->slices > 256)
             c->slices = 256;
-        }
     } else {
         c->slices = avctx->slices;
     }