diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 22:43:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 22:43:16 +0200 |
| commit | 373d7dd3716067d5151fe33b35db1aa3d1921229 (patch) | |
| tree | 9712979adf1cb11344e7247a63628831b5fd52e2 | |
| parent | 75ef907db80f77912f8e7815e75cf401dd68e2f2 (diff) | |
| parent | 911fa05b514e1be009e00b79d7004b93717c023b (diff) | |
| download | ffmpeg-373d7dd3716067d5151fe33b35db1aa3d1921229.tar.gz | |
Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'
* commit '911fa05b514e1be009e00b79d7004b93717c023b':
mvc: Specify the pixel format for the mv-mvc* tests
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mvcdec.c | 2 | ||||
| -rw-r--r-- | tests/fate/video.mak | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index f37b76da8c..69f0ee259c 100644 --- a/libavcodec/mvcdec.c +++ b/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); diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 6dc56f6c7a..fd42068eea 100644 --- a/tests/fate/video.mak +++ b/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 |