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/mss12.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libavcodec/mss12.c') diff --git a/libavcodec/mss12.c b/libavcodec/mss12.c index f0f23c0f8e..18f2f2808f 100644 --- a/libavcodec/mss12.c +++ b/libavcodec/mss12.c @@ -690,10 +690,6 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version) return AVERROR(ENOMEM); } - avctx->pix_fmt = version ? c->free_colours == 127 ? PIX_FMT_RGB555 - : PIX_FMT_RGB24 - : PIX_FMT_PAL8; - codec_init(c, version); return 0; -- cgit v1.2.3