cbs: Add an explicit type for coded bitstream unit types

[ffmpeg] / libavcodec / mss12.h

diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h
index 678a0c0dfbc47fa10d211eff82b47a437bac16a6..8cad5dcedc5c95bfa1bd0ce889c6efca1b7cc20f 100644 (file)
--- a/libavcodec/mss12.h
+++ b/libavcodec/mss12.h
@@ -77,12 +77,12 @@ typedef struct MSS12Context {
     uint32_t       pal[256];
     uint8_t        *pal_pic;
     uint8_t        *last_pal_pic;
-    int            pal_stride;
+    ptrdiff_t      pal_stride;
     uint8_t        *mask;
-    int            mask_stride;
+    ptrdiff_t      mask_stride;
     uint8_t        *rgb_pic;
     uint8_t        *last_rgb_pic;
-    int            rgb_stride;
+    ptrdiff_t      rgb_stride;
     int            free_colours;
     int            keyframe;
     int            mvX, mvY;
@@ -95,15 +95,15 @@ int ff_mss12_decode_rect(SliceContext *ctx, ArithCoder *acoder,
                          int x, int y, int width, int height);
 void ff_mss12_model_update(Model *m, int val);
 void ff_mss12_slicecontext_reset(SliceContext *sc);
-av_cold int ff_mss12_decode_init(MSS12Context *c, int version,
-                                 SliceContext* sc1, SliceContext *sc2);
-av_cold int ff_mss12_decode_end(MSS12Context *ctx);
+int ff_mss12_decode_init(MSS12Context *c, int version,
+                         SliceContext *sc1, SliceContext *sc2);
+int ff_mss12_decode_end(MSS12Context *ctx);
 
 #define ARITH_GET_BIT(VERSION)                                          \
 static int arith ## VERSION ## _get_bit(ArithCoder *c)                  \
 {                                                                       \
     int range = c->high - c->low + 1;                                   \
-    int bit   = (((c->value - c->low) << 1) + 1) / range;               \
+    int bit   = 2 * c->value - c->low >= c->high;                       \
                                                                         \
     if (bit)                                                            \
         c->low += range >> 1;                                           \