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.
Unified · Split
| @@ -29,7 +29,6 @@ · 28 unmodified lines | ||
| 29 | 29 | #include "bytestream.h" |
| 30 | 30 | #include "avcodec.h" |
| 31 | 31 | #include "get_bits.h" |
| 32 | −#include "iff.h" | |
| 33 | 32 | |
| 34 | 33 | typedef struct { |
| 35 | 34 | AVFrame frame; |
| @@ -120,7 +119,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) { · 84 unmodified lines | ||
| 120 | 119 | /** |
| 121 | 120 | * Convert CMAP buffer (stored in extradata) to lavc palette format |
| 122 | 121 | */ |
| 123 | −int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) | |
| 122 | +static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) | |
| 124 | 123 | { |
| 125 | 124 | int count, i; |
| 126 | 125 | |
| @@ -1,30 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * IFF PBM/ILBM bitmap decoder | |
| 3 | − * Copyright (c) 2010 Peter Ross <pross@xvid.org> | |
| 4 | − * | |
| 5 | − * This file is part of FFmpeg. | |
| 6 | − * | |
| 7 | − * FFmpeg is free software; you can redistribute it and/or | |
| 8 | − * modify it under the terms of the GNU Lesser General Public | |
| 9 | − * License as published by the Free Software Foundation; either | |
| 10 | − * version 2.1 of the License, or (at your option) any later version. | |
| 11 | − * | |
| 12 | − * FFmpeg is distributed in the hope that it will be useful, | |
| 13 | − * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | − * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 | − * Lesser General Public License for more details. | |
| 16 | − * | |
| 17 | − * You should have received a copy of the GNU Lesser General Public | |
| 18 | − * License along with FFmpeg; if not, write to the Free Software | |
| 19 | − * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 20 | − */ | |
| 21 | − | |
| 22 | −#ifndef AVCODEC_IFF_H | |
| 23 | −#define AVCODEC_IFF_H | |
| 24 | − | |
| 25 | −#include <stdint.h> | |
| 26 | −#include "avcodec.h" | |
| 27 | − | |
| 28 | −int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal); | |
| 29 | − | |
| 30 | −#endif /* AVCODEC_IFF_H */ | |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | ||
| 30 | 30 | */ |
| 31 | 31 | |
| 32 | 32 | #include "libavutil/intreadwrite.h" |
| 33 | −#include "libavcodec/iff.h" | |
| 34 | 33 | #include "avformat.h" |
| 35 | 34 | |
| 36 | 35 | #define ID_8SVX MKTAG('8','S','V','X') |