parser: Move Doxygen documentation to the header files

[ffmpeg] / libavcodec / mss1.c

diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c
index ada479eee7810df9ba9c27e886dc1b70cf690f1e..f72385f9fe31897caaeee8b12e04147ca4a05c8f 100644 (file)
--- a/libavcodec/mss1.c
+++ b/libavcodec/mss1.c
@@ -30,7 +30,7 @@
 typedef struct MSS1Context {
     MSS12Context   ctx;
     AVFrame        pic;
-    SliceContext   sc[2];
+    SliceContext   sc;
 } MSS1Context;
 
 static void arith_normalise(ArithCoder *c)
@@ -89,7 +89,7 @@ static int arith_get_number(ArithCoder *c, int mod_val)
     return val;
 }
 
-static int arith_get_prob(ArithCoder *c, int *probs)
+static int arith_get_prob(ArithCoder *c, int16_t *probs)
 {
     int range = c->high - c->low + 1;
     int val   = ((c->value - c->low + 1) * probs[0] - 1) / range;
@@ -162,7 +162,8 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     c->pal_stride = -ctx->pic.linesize[0];
     c->keyframe   = !arith_get_bit(&acoder);
     if (c->keyframe) {
-        ff_mss12_codec_reset(c);
+        c->corrupted = 0;
+        ff_mss12_slicecontext_reset(&ctx->sc);
         pal_changed        = decode_pal(c, &acoder);
         ctx->pic.key_frame = 1;
         ctx->pic.pict_type = AV_PICTURE_TYPE_I;
@@ -172,7 +173,7 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         ctx->pic.key_frame = 0;
         ctx->pic.pict_type = AV_PICTURE_TYPE_P;
     }
-    c->corrupted = ff_mss12_decode_rect(&c->sc[0], &acoder, 0, 0,
+    c->corrupted = ff_mss12_decode_rect(&ctx->sc, &acoder, 0, 0,
                                         avctx->width, avctx->height);
     if (c->corrupted)
         return AVERROR_INVALIDDATA;
@@ -189,11 +190,16 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 static av_cold int mss1_decode_init(AVCodecContext *avctx)
 {
     MSS1Context * const c = avctx->priv_data;
+    int ret;
 
     c->ctx.avctx       = avctx;
     avctx->coded_frame = &c->pic;
 
-    return ff_mss12_decode_init(&c->ctx, 0);
+    ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL);
+
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
+
+    return ret;
 }
 
 static av_cold int mss1_decode_end(AVCodecContext *avctx)