diff options
Diffstat (limited to 'libavcodec/h264data.h')
| -rw-r--r-- | libavcodec/h264data.h | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index ab96f0835a..988352aa9a 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -1,18 +1,18 @@ /* - * 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 */ @@ -48,12 +48,32 @@ extern const PMbInfo ff_h264_p_sub_mb_type_info[4]; extern const PMbInfo ff_h264_b_mb_type_info[23]; extern const PMbInfo ff_h264_b_sub_mb_type_info[13]; +static const AVRational ff_h264_pixel_aspect[17] = { + { 0, 1 }, + { 1, 1 }, + { 12, 11 }, + { 10, 11 }, + { 16, 11 }, + { 40, 33 }, + { 24, 11 }, + { 20, 11 }, + { 32, 11 }, + { 80, 33 }, + { 18, 11 }, + { 15, 11 }, + { 64, 33 }, + { 160, 99 }, + { 4, 3 }, + { 3, 2 }, + { 2, 1 }, +}; + extern const uint8_t ff_h264_dequant4_coeff_init[6][3]; extern const uint8_t ff_h264_dequant8_coeff_init_scan[16]; extern const uint8_t ff_h264_dequant8_coeff_init[6][6]; extern const uint8_t ff_h264_quant_rem6[QP_MAX_NUM + 1]; extern const uint8_t ff_h264_quant_div6[QP_MAX_NUM + 1]; -extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM + 1]; +extern const uint8_t ff_h264_chroma_qp[7][QP_MAX_NUM + 1]; #endif /* AVCODEC_H264DATA_H */ |