diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index f6c5e3c476b56c550a354522495e88c059d25027..547bee2405c20dc29ba242c3a65b7fdb2b68aa09 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -33,7 +33,6 @@ #include "avcodec.h" #include "dsputil.h" #include "internal.h" -#include "imgconvert.h" #include "libavutil/colorspace.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h deleted file mode 100644 index c99e58790675da790241ebb64b6d0f4ee1bfdf54..0000000000000000000000000000000000000000 --- a/libavcodec/imgconvert.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Misc image conversion routines - * most functionality is exported to the public API, see avcodec.h - * - * Copyright (c) 2008 Vitor Sessak - * - * 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.1 of the License, or (at your option) any later version. - * - * 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_IMGCONVERT_H -#define AVCODEC_IMGCONVERT_H - -#include <stdint.h> -#include "avcodec.h" - -#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); - -attribute_deprecated -int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt); -#endif - -#endif /* AVCODEC_IMGCONVERT_H */ diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 6f4c0ced3b110639d85a4abdd4df32abe045cb68..ee316ea723fb1594edc23b5f35d6d7efc5a4eab6 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "imgconvert.h" #include "raw.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0e4048ec6e01aacf041ab9b466e963d92244822a..c08bad5e0236a59c099e53b0dddccc1ce01feab1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -37,7 +37,6 @@ #include "avcodec.h" #include "dsputil.h" #include "libavutil/opt.h" -#include "imgconvert.h" #include "thread.h" #include "audioconvert.h" #include "internal.h"