summaryrefslogtreecommitdiff
path: root/libavcodec/motionpixels.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-11-26 21:15:06 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-11-26 21:15:06 +0000
commit7c7d3abf3c64c84b2e096b0e74da4fa9a758d53d (patch)
tree7967f67a0f4637e7825f6023d49fad29035b13e8 /libavcodec/motionpixels.c
parenta9af75ae850d54cb4a03ce29a0f59c34b4f8f9ce (diff)
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
Diffstat (limited to 'libavcodec/motionpixels.c')
-rw-r--r--libavcodec/motionpixels.c1
1 files changed, 1 insertions, 0 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;
}