X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fimgconvert.h;h=c99e58790675da790241ebb64b6d0f4ee1bfdf54;hb=278d88689ba89c78f6c2667cf98025835567d78d;hp=2370aa6f7d344a6a872cb57245db98eb5e978767;hpb=f037f7e0323a6a550b5b79a260d06b6f8f3a6701;p=ffmpeg diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h index 2370aa6f7d3..c99e5879067 100644 --- a/libavcodec/imgconvert.h +++ b/libavcodec/imgconvert.h @@ -4,30 +4,41 @@ * * Copyright (c) 2008 Vitor Sessak * - * 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 */ -#ifndef FFMPEG_IMGCONVERT_H -#define FFMPEG_IMGCONVERT_H +#ifndef AVCODEC_IMGCONVERT_H +#define AVCODEC_IMGCONVERT_H -int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width); +#include +#include "avcodec.h" -int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height); +#if LIBAVCODEC_VERSION_MAJOR < 53 +attribute_deprecated +int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width); +attribute_deprecated +int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height); + +attribute_deprecated int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); -#endif /* FFMPEG_IMGCONVERT_H */ +attribute_deprecated +int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt); +#endif + +#endif /* AVCODEC_IMGCONVERT_H */