[FFmpeg-cvslog] avcodec/xan: use init_get_bits8()

Paul B Mahol git at videolan.org
Wed Oct 30 12:41:52 CET 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Oct 29 13:22:36 2013 +0000| [2508fa10c6189a093752af2ef75772a5312ea39a] | committer: Paul B Mahol

avcodec/xan: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2508fa10c6189a093752af2ef75772a5312ea39a
---

 libavcodec/xan.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 1c2e97c..33bc0b0 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -111,12 +111,11 @@ static int xan_huffman_decode(uint8_t *dest, int dest_len,
     uint8_t val = ival;
     uint8_t *dest_end = dest + dest_len;
     uint8_t *dest_start = dest;
+    int ret;
     GetBitContext gb;
 
-    if (ptr_len < 0)
-        return AVERROR_INVALIDDATA;
-
-    init_get_bits(&gb, ptr, ptr_len * 8);
+    if ((ret = init_get_bits8(&gb, ptr, ptr_len)) < 0)
+        return ret;
 
     while (val != 0x16) {
         unsigned idx = val - 0x17 + get_bits1(&gb) * byte;



More information about the ffmpeg-cvslog mailing list