Commit c75640e9 authored by Ni Hui's avatar Ni Hui Committed by Michael Niedermayer

avcodec/lzw: ff_lzw_decode_tail() now returns the consumed bytes in lzw decompress

Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 7b67fe20
...@@ -93,7 +93,7 @@ static int lzw_get_code(struct LZWState * s) ...@@ -93,7 +93,7 @@ static int lzw_get_code(struct LZWState * s)
return c & s->curmask; return c & s->curmask;
} }
void ff_lzw_decode_tail(LZWState *p) int ff_lzw_decode_tail(LZWState *p)
{ {
struct LZWState *s = (struct LZWState *)p; struct LZWState *s = (struct LZWState *)p;
...@@ -104,6 +104,7 @@ void ff_lzw_decode_tail(LZWState *p) ...@@ -104,6 +104,7 @@ void ff_lzw_decode_tail(LZWState *p)
} }
}else }else
bytestream2_skip(&s->gb, bytestream2_get_bytes_left(&s->gb)); bytestream2_skip(&s->gb, bytestream2_get_bytes_left(&s->gb));
return bytestream2_tell(&s->gb);
} }
av_cold void ff_lzw_decode_open(LZWState **p) av_cold void ff_lzw_decode_open(LZWState **p)
......
...@@ -47,7 +47,7 @@ void ff_lzw_decode_open(LZWState **p); ...@@ -47,7 +47,7 @@ void ff_lzw_decode_open(LZWState **p);
void ff_lzw_decode_close(LZWState **p); void ff_lzw_decode_close(LZWState **p);
int ff_lzw_decode_init(LZWState *s, int csize, const uint8_t *buf, int buf_size, int mode); int ff_lzw_decode_init(LZWState *s, int csize, const uint8_t *buf, int buf_size, int mode);
int ff_lzw_decode(LZWState *s, uint8_t *buf, int len); int ff_lzw_decode(LZWState *s, uint8_t *buf, int len);
void ff_lzw_decode_tail(LZWState *lzw); int ff_lzw_decode_tail(LZWState *lzw);
/** LZW encode state */ /** LZW encode state */
struct LZWEncodeState; struct LZWEncodeState;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment