From 7c7d3abf3c64c84b2e096b0e74da4fa9a758d53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Thu, 26 Nov 2009 21:15:06 +0000 Subject: [PATCH] 10l, pix_fmt should be set by the motionpixels decoder, not by the demuxer. This fixes playback when lavf and lavc are less tightly couples as in e.g. MPlayer. Originally committed as revision 20626 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/motionpixels.c | 1 + libavformat/mvi.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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;