diff options
| author | Alberto Delmás <adelmas@gmail.com> | 2012-09-02 12:42:01 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-09-03 14:39:19 +0200 |
| commit | a97ee41bee60b2075c84e2ce6bb441304698744c (patch) | |
| tree | 4b615750c961e97d1f959e82e248ecb09bf67fda /libavcodec/mss12.h | |
| parent | eb239a577fcf1f19cdaa7aeb6e6586a172ee59c1 (diff) | |
mss12: move SliceContexts out of the common context into the codec contexts
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/mss12.h')
| -rw-r--r-- | libavcodec/mss12.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index 93d1f6146f..97cd25fdf2 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -86,21 +86,18 @@ typedef struct MSS12Context { int rgb_stride; int free_colours; int keyframe; - Model intra_region, inter_region; - Model pivot, edge_mode, split_mode; - PixContext intra_pix_ctx, inter_pix_ctx; int mvX, mvY; int corrupted; int slice_split; int full_model_syms; - SliceContext sc[2]; } MSS12Context; 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_codec_reset(MSS12Context *ctx); -av_cold int ff_mss12_decode_init(MSS12Context *ctx, int version); +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); #define ARITH_GET_BIT(VERSION) \ |