X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpeg12data.h;h=c6750b81095082ac0b8f9d9bbb8af7851a827986;hb=846c3d6aca5484904e60946c4fe8b8833bc07f92;hp=e23ec83188b20b710c72fb383c4e7983b106c516;hpb=3bfe9260fa0b9e46e0d23cc085fa55db1050a0bd;p=ffmpeg diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index e23ec83188b..c6750b81095 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -1,35 +1,35 @@ /* - * MPEG1/2 tables + * MPEG-1/2 tables * copyright (c) 2000,2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * 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.1 of the License, or (at your option) any later version. * - * FFmpeg 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 FFmpeg; 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 */ /** - * @file mpeg12data.h - * MPEG1/2 tables. + * @file + * MPEG-1/2 tables. */ -#ifndef FFMPEG_MPEG12DATA_H -#define FFMPEG_MPEG12DATA_H +#ifndef AVCODEC_MPEG12DATA_H +#define AVCODEC_MPEG12DATA_H #include -#include "rational.h" +#include "libavutil/rational.h" #include "rl.h" extern const uint16_t ff_mpeg1_default_intra_matrix[64]; @@ -48,9 +48,9 @@ extern const uint8_t ff_mpeg12_mbPatTable[64][2]; extern const uint8_t ff_mpeg12_mbMotionVectorTable[17][2]; -extern const AVRational ff_frame_rate_tab[]; +extern const AVRational ff_mpeg12_frame_rate_tab[]; extern const float ff_mpeg1_aspect[16]; extern const AVRational ff_mpeg2_aspect[16]; -#endif /* FFMPEG_MPEG12DATA_H */ +#endif /* AVCODEC_MPEG12DATA_H */