summaryrefslogtreecommitdiff
path: root/libavcodec/mss2.c
diff options
context:
space:
mode:
authorAlberto Delmás <adelmas@gmail.com>2012-08-31 07:59:36 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2012-08-31 08:08:43 +0200
commitede3d6400d7c06863e6eb4bcff5f676480ae6b5e (patch)
treef20968e85f3701cd55e7d426b340337f6b4d427d /libavcodec/mss2.c
parentee769c6a7c1d4ec6560f5e5a6f457b770b10fb33 (diff)
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 <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/mss2.c')
-rw-r--r--libavcodec/mss2.c4
1 files changed, 4 insertions, 0 deletions
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;
}