Merge remote-tracking branch 'qatar/master'

* qatar/master:
  utvideodec: Set colorspace by codec_tag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/utvideodec.c

@@ -507,22 +507,24 @@ static av_cold int decode_init(AVCodecContext *avctx)
     case MKTAG('U', 'L', 'Y', '0'):
         c->planes      = 3;
         avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+        avctx->colorspace = AVCOL_SPC_BT470BG;
         break;
     case MKTAG('U', 'L', 'Y', '2'):
         c->planes      = 3;
         avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+        avctx->colorspace = AVCOL_SPC_BT470BG;
         break;
     case MKTAG('U', 'L', 'H', '0'):
         c->planes      = 3;
+        avctx->pix_fmt = AV_PIX_FMT_YUV420P;
         avctx->color_primaries = AVCOL_PRI_BT709;
         avctx->colorspace = AVCOL_SPC_BT709;
-        avctx->pix_fmt = AV_PIX_FMT_YUV420P;
         break;
     case MKTAG('U', 'L', 'H', '2'):
         c->planes      = 3;
+        avctx->pix_fmt = AV_PIX_FMT_YUV422P;
         avctx->color_primaries = AVCOL_PRI_BT709;
         avctx->colorspace = AVCOL_SPC_BT709;
-        avctx->pix_fmt = AV_PIX_FMT_YUV422P;
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "Unknown Ut Video FOURCC provided (%08X)\n",