Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Delmás <adelmas@gmail.com>2012-08-31 09:59:36 +0400
committerKostya Shishkov <kostya.shishkov@gmail.com>2012-08-31 10:08:43 +0400
commitede3d6400d7c06863e6eb4bcff5f676480ae6b5e (patch)
treef20968e85f3701cd55e7d426b340337f6b4d427d /libavcodec/mss12.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/mss12.c')
-rw-r--r--libavcodec/mss12.c4
1 files changed, 0 insertions, 4 deletions
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;