X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvp3data.h;h=54d5a6c57644993ed1fd45bb3aa067bab675c976;hb=34ca5ae51d7d411a5a891521a79c1284e046bf2f;hp=9dd3c38c7395c11f752bddde2a9bfb4617035fa5;hpb=04d7f601435e225e65b6a2ce45596ef03976c18c;p=ffmpeg diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h index 9dd3c38c739..54d5a6c5764 100644 --- a/libavcodec/vp3data.h +++ b/libavcodec/vp3data.h @@ -1,23 +1,28 @@ /* * copyright (C) 2003 the ffmpeg project * - * This library is free software; you can redistribute it and/or + * This file is part of Libav. + * + * Libav 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * Libav 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 this library; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP3DATA_H -#define VP3DATA_H +#ifndef AVCODEC_VP3DATA_H +#define AVCODEC_VP3DATA_H + +#include +#include /* these coefficients dequantize intraframe Y plane coefficients * (note: same as JPEG) */ @@ -79,7 +84,7 @@ static const uint32_t vp31_ac_scale_factor[64] = 21, 19, 18, 17, 15, 13, 12, 10 }; -static const uint32_t vp31_filter_limit_values[64] = +static const uint8_t vp31_filter_limit_values[64] = { 30, 25, 20, 20, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8, 8, 7, 7, 7, 7, @@ -400,7 +405,7 @@ static const int16_t coeff_table_token_22[1024] = { -573, -574, -575, -576, -577, -578, -579, -580 }; -static const int16_t *coeff_tables[32] = { +static const int16_t *const coeff_tables[32] = { NULL, NULL, NULL, @@ -3173,4 +3178,4 @@ static const uint16_t ac_bias_3[16][32][2] = { } }; -#endif /* VP3DATA_H */ +#endif /* AVCODEC_VP3DATA_H */