diff options
| author | Martin Storsjö <martin@martin.st> | 2014-04-19 18:51:38 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-04-19 21:41:34 +0300 |
| commit | 911fa05b514e1be009e00b79d7004b93717c023b (patch) | |
| tree | e830f347d86cc4dd5df172a9eb9d6d75c88934c1 | |
| parent | 6dfd99c93808d6504dd5cb1fad847d68cb179352 (diff) | |
| download | ffmpeg-911fa05b514e1be009e00b79d7004b93717c023b.tar.gz | |
mvc: Specify the pixel format for the mv-mvc* tests
Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.
This fixes the tests on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 fefb705bb9..7cc0329257 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 62cc102f44..9698dbf9bc 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -185,10 +185,10 @@ FATE_SAMPLES_AVCONV-$(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_SAMPLES_AVCONV-$(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_SAMPLES_AVCONV-$(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_SAMPLES_AVCONV-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an |