aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNi Hui <shuizhuyuanluo@126.com>2015-11-10 22:03:36 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-10 23:21:27 +0100
commitc75640e9c9e1d4fb6f043ec5f8fc16bc06a885df (patch)
tree852f73a3a268c8c995b5ba5c9d4cf1ac1f64505a
parent7b67fe20f6c5ce21ed1cac01fdb1906e515bc87e (diff)
downloadffmpeg-c75640e9c9e1d4fb6f043ec5f8fc16bc06a885df.tar.gz
avcodec/lzw: ff_lzw_decode_tail() now returns the consumed bytes in lzw decompress
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/lzw.c3
-rw-r--r--libavcodec/lzw.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c
index 6832c122a2..b0b9a34358 100644
--- a/libavcodec/lzw.c
+++ b/libavcodec/lzw.c
@@ -93,7 +93,7 @@ static int lzw_get_code(struct LZWState * s)
return c & s->curmask;
}
-void ff_lzw_decode_tail(LZWState *p)
+int ff_lzw_decode_tail(LZWState *p)
{
struct LZWState *s = (struct LZWState *)p;
@@ -104,6 +104,7 @@ void ff_lzw_decode_tail(LZWState *p)
}
}else
bytestream2_skip(&s->gb, bytestream2_get_bytes_left(&s->gb));
+ return bytestream2_tell(&s->gb);
}
av_cold void ff_lzw_decode_open(LZWState **p)
diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index 4653c1c74f..6af8a6b83a 100644
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -47,7 +47,7 @@ void ff_lzw_decode_open(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(LZWState *s, uint8_t *buf, int len);
-void ff_lzw_decode_tail(LZWState *lzw);
+int ff_lzw_decode_tail(LZWState *lzw);
/** LZW encode state */
struct LZWEncodeState;