diff options
Diffstat (limited to 'libavcodec/asv.h')
| -rw-r--r-- | libavcodec/asv.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h index 7c4e4fd..a1366b6 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -1,20 +1,20 @@ /* * Copyright (c) 2003 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 */ @@ -31,11 +31,11 @@ #include "libavutil/mem.h" #include "avcodec.h" -#include "bitstream.h" #include "blockdsp.h" #include "bswapdsp.h" #include "fdctdsp.h" #include "idctdsp.h" +#include "get_bits.h" #include "pixblockdsp.h" #include "put_bits.h" @@ -47,14 +47,14 @@ typedef struct ASV1Context { IDCTDSPContext idsp; PixblockDSPContext pdsp; PutBitContext pb; - BitstreamContext bc; + GetBitContext gb; ScanTable scantable; int inv_qscale; int mb_width; int mb_height; int mb_width2; int mb_height2; - DECLARE_ALIGNED(16, int16_t, block)[6][64]; + DECLARE_ALIGNED(32, int16_t, block)[6][64]; uint16_t intra_matrix[64]; int q_intra_matrix[64]; uint8_t *bitstream_buffer; |
