diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-09-24 16:51:33 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-09-27 12:02:33 +0200 |
| commit | 0ae3ba8daaab9b6b2679225f5d08046ffbcd6250 (patch) | |
| tree | ab5731abbb824c6189f484b80a6e79f52d31ec9c | |
| parent | bcc1f7caeb3ffce072e7f79412383a2da016f848 (diff) | |
| download | ffmpeg-0ae3ba8daaab9b6b2679225f5d08046ffbcd6250.tar.gz | |
avcodec: Drop long-deprecated imgconvert.h header
| -rw-r--r-- | libavcodec/imgconvert.c | 1 | ||||
| -rw-r--r-- | libavcodec/imgconvert.h | 44 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 |
4 files changed, 0 insertions, 47 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index f6c5e3c476..547bee2405 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 c99e587906..0000000000 --- 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 6f4c0ced3b..ee316ea723 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 0e4048ec6e..c08bad5e02 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" |