diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 00:29:44 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-01-26 16:08:04 +0000 |
| commit | 2d162e3825a35b6ac42a27d27c4a3ebbd141828d (patch) | |
| tree | c65389457ce25cca562dc4462eda4260ba150854 | |
| parent | 4c57cde942b3d28074d0bb06e2ca200bc1098f22 (diff) | |
| download | ffmpeg-2d162e3825a35b6ac42a27d27c4a3ebbd141828d.tar.gz | |
Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/iff.c | 3 | ||||
| -rw-r--r-- | libavcodec/iff.h | 30 | ||||
| -rw-r--r-- | libavformat/iff.c | 1 |
3 files changed, 1 insertions, 33 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 19f4172154..aeff0b5ba5 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -29,7 +29,6 @@ #include "bytestream.h" #include "avcodec.h" #include "get_bits.h" -#include "iff.h" typedef struct { AVFrame frame; @@ -120,7 +119,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) { /** * Convert CMAP buffer (stored in extradata) to lavc palette format */ -int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) +static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) { int count, i; diff --git a/libavcodec/iff.h b/libavcodec/iff.h deleted file mode 100644 index 76db10b884..0000000000 --- a/libavcodec/iff.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * IFF PBM/ILBM bitmap decoder - * Copyright (c) 2010 Peter Ross <pross@xvid.org> - * - * This file is part of FFmpeg. - * - * 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. - * - * 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_IFF_H -#define AVCODEC_IFF_H - -#include <stdint.h> -#include "avcodec.h" - -int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal); - -#endif /* AVCODEC_IFF_H */ diff --git a/libavformat/iff.c b/libavformat/iff.c index e1afefbff3..e87195654f 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -30,7 +30,6 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcodec/iff.h" #include "avformat.h" #define ID_8SVX MKTAG('8','S','V','X') |