diff options
Diffstat (limited to 'libavcodec/rangecoder.c')
| -rw-r--r-- | libavcodec/rangecoder.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index af0a8c009e..29fb909668 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -2,20 +2,20 @@ * Range coder * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -34,6 +34,7 @@ #include <string.h> #include "libavutil/attributes.h" +#include "libavutil/avassert.h" #include "avcodec.h" #include "rangecoder.h" #include "bytestream.h" @@ -55,7 +56,7 @@ av_cold void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, /* cast to avoid compiler warning */ ff_init_range_encoder(c, (uint8_t *)buf, buf_size); - c->low = bytestream_get_be16(&c->bytestream); + c->low = bytestream_get_be16((const uint8_t **)&c->bytestream); } void ff_build_rac_states(RangeCoder *c, int factor, int max_p) @@ -107,8 +108,8 @@ int ff_rac_terminate(RangeCoder *c) c->range = 0xFF; renorm_encoder(c); - assert(c->low == 0); - assert(c->range >= 0x100); + av_assert1(c->low == 0); + av_assert1(c->range >= 0x100); return c->bytestream - c->bytestream_start; } @@ -119,11 +120,12 @@ int ff_rac_terminate(RangeCoder *c) #include "libavutil/lfg.h" #include "libavutil/log.h" +static uint8_t b[9 * SIZE]; +static uint8_t r[9 * SIZE]; + int main(void) { RangeCoder c; - uint8_t b[9 * SIZE]; - uint8_t r[9 * SIZE]; int i; uint8_t state[10]; AVLFG prng; |