diff options
Diffstat (limited to 'libavcodec/rl.h')
| -rw-r--r-- | libavcodec/rl.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libavcodec/rl.h b/libavcodec/rl.h index fe4efef..33f4ef8 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -2,20 +2,20 @@ * Copyright (c) 2000-2002 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer * - * 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 */ @@ -44,7 +44,6 @@ typedef struct RLTable { uint8_t *index_run[2]; ///< encoding only int8_t *max_level[2]; ///< encoding & decoding int8_t *max_run[2]; ///< encoding & decoding - VLC vlc; ///< decoding only deprecated FIXME remove RL_VLC_ELEM *rl_vlc[32]; ///< decoding only } RLTable; @@ -54,7 +53,7 @@ typedef struct RLTable { * the level and run tables, if this is NULL av_malloc() will be used */ int ff_rl_init(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]); -void ff_rl_init_vlc(RLTable *rl); +void ff_rl_init_vlc(RLTable *rl, unsigned static_size); /** * Free the contents of a dynamically allocated table. @@ -65,15 +64,12 @@ void ff_rl_free(RLTable *rl); {\ int q;\ static RL_VLC_ELEM rl_vlc_table[32][static_size];\ - INIT_VLC_STATIC(&rl.vlc, 9, rl.n + 1,\ - &rl.table_vlc[0][1], 4, 2,\ - &rl.table_vlc[0][0], 4, 2, static_size);\ \ if(!rl.rl_vlc[0]){\ for(q=0; q<32; q++)\ rl.rl_vlc[q]= rl_vlc_table[q];\ \ - ff_rl_init_vlc(&rl);\ + ff_rl_init_vlc(&rl, static_size);\ }\ } |
