diff options
Diffstat (limited to 'libavcodec/cabac_functions.h')
| -rw-r--r-- | libavcodec/cabac_functions.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index 4b8f1bca8a..d7d6d7dfdb 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -2,20 +2,20 @@ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder * Copyright (c) 2003 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 */ @@ -54,7 +54,9 @@ static void refill(CABACContext *c){ c->low+= c->bytestream[0]<<1; #endif c->low -= CABAC_MASK; +#if !UNCHECKED_BITSTREAM_READER if (c->bytestream < c->bytestream_end) +#endif c->bytestream += CABAC_BITS / 8; } @@ -82,7 +84,9 @@ static void refill2(CABACContext *c){ #endif c->low += x<<i; +#if !UNCHECKED_BITSTREAM_READER if (c->bytestream < c->bytestream_end) +#endif c->bytestream += CABAC_BITS/8; } |