summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/motionpixels.c1
-rw-r--r--libavformat/mvi.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index 227b178135..a0f0d1a455 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -112,6 +112,7 @@ static av_cold int mp_decode_init(AVCodecContext *avctx)
mp->offset_bits_len = av_log2(avctx->width * avctx->height) + 1;
mp->vpt = av_mallocz(avctx->height * sizeof(YuvPixel));
mp->hpt = av_mallocz(avctx->height * avctx->width / 16 * sizeof(YuvPixel));
+ avctx->pix_fmt = PIX_FMT_RGB555;
return 0;
}
diff --git a/libavformat/mvi.c b/libavformat/mvi.c
index 2dc4667a68..89c47da473 100644
--- a/libavformat/mvi.c
+++ b/libavformat/mvi.c
@@ -86,7 +86,6 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
av_set_pts_info(vst, 64, msecs_per_frame, 1000000);
vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = CODEC_ID_MOTIONPIXELS;
- vst->codec->pix_fmt = PIX_FMT_RGB555;
mvi->get_int = (vst->codec->width * vst->codec->height < (1 << 16)) ? get_le16 : get_le24;