diff options
Diffstat (limited to 'libavcodec/mss12.h')
| -rw-r--r-- | libavcodec/mss12.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index 5b1fee8913..f953167389 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -1,20 +1,20 @@ /* * Copyright (c) 2012 Konstantin Shishkov * - * 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 */ @@ -99,8 +99,8 @@ int ff_mss12_decode_init(MSS12Context *c, int version, SliceContext *sc1, SliceContext *sc2); int ff_mss12_decode_end(MSS12Context *ctx); -#define ARITH_GET_BIT(VERSION) \ -static int arith ## VERSION ## _get_bit(ArithCoder *c) \ +#define ARITH_GET_BIT(prefix) \ +static int prefix ## _get_bit(ArithCoder *c) \ { \ int range = c->high - c->low + 1; \ int bit = 2 * c->value - c->low >= c->high; \ @@ -110,22 +110,22 @@ static int arith ## VERSION ## _get_bit(ArithCoder *c) \ else \ c->high = c->low + (range >> 1) - 1; \ \ - arith ## VERSION ## _normalise(c); \ + prefix ## _normalise(c); \ \ return bit; \ } -#define ARITH_GET_MODEL_SYM(VERSION) \ -static int arith ## VERSION ## _get_model_sym(ArithCoder *c, Model *m) \ +#define ARITH_GET_MODEL_SYM(prefix) \ +static int prefix ## _get_model_sym(ArithCoder *c, Model *m) \ { \ int idx, val; \ \ - idx = arith ## VERSION ## _get_prob(c, m->cum_prob); \ + idx = prefix ## _get_prob(c, m->cum_prob); \ \ val = m->idx2sym[idx]; \ ff_mss12_model_update(m, idx); \ \ - arith ## VERSION ## _normalise(c); \ + prefix ## _normalise(c); \ \ return val; \ } |