Merge commit '911fa05b'

* commit '911fa05b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mvcdec.c

@@ -52,7 +52,7 @@ static av_cold int mvc_decode_init(AVCodecContext *avctx)
         return ret;
 
     avctx->pix_fmt = (avctx->codec_id == AV_CODEC_ID_MVC1) ? AV_PIX_FMT_RGB555
-                                                           : AV_PIX_FMT_BGRA;
+                                                           : AV_PIX_FMT_RGB32;
     s->frame       = av_frame_alloc();
     if (!s->frame)
         return AVERROR(ENOMEM);

tests/fate/video.mak

@@ -190,10 +190,10 @@ FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30
 
 FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1
-fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25
+fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le
 
 FATE_VIDEO-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2
-fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30
+fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30 -pix_fmt bgra
 
 FATE_VIDEO-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle
 fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an