From ede3d6400d7c06863e6eb4bcff5f676480ae6b5e Mon Sep 17 00:00:00 2001 From: Alberto Delmás Date: Fri, 31 Aug 2012 07:59:36 +0200 Subject: MSS1 and MSS2: set final pixel format after common stuff has been initialised This way it won't interfere with WMV9 initialisation inside MSS2 decoder and avplay will play it fine. Signed-off-by: Kostya Shishkov --- libavcodec/mss2.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/mss2.c') diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index c0c47dc8d3..2a0bf47cde 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -844,6 +844,10 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) return ret; } ff_mss2dsp_init(&ctx->dsp); + + avctx->pix_fmt = c->free_colours == 127 ? PIX_FMT_RGB555 + : PIX_FMT_RGB24; + return 0; } -- cgit v1.2.3