diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-08 02:36:00 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-08 02:36:00 +0000 |
| commit | d9747e29b657f6d999327ee2f2e48a0fe176b87c (patch) | |
| tree | dbbfd632f170812966c45b070075a17f5543f4c1 | |
| parent | ae2c69438881ecd9f3ff7dffaf66e62379279820 (diff) | |
| download | ffmpeg-d9747e29b657f6d999327ee2f2e48a0fe176b87c.tar.gz | |
IFF: move ff_cmap_read_palette() prototype to a header file
Originally committed as revision 22307 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/iff.c | 1 | ||||
| -rw-r--r-- | libavcodec/iff.h | 30 | ||||
| -rw-r--r-- | libavformat/iff.c | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index a8e64268ee..490d347ec0 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -27,6 +27,7 @@ #include "bytestream.h" #include "avcodec.h" #include "get_bits.h" +#include "iff.h" typedef struct { AVFrame frame; diff --git a/libavcodec/iff.h b/libavcodec/iff.h new file mode 100644 index 0000000000..76db10b884 --- /dev/null +++ b/libavcodec/iff.h @@ -0,0 +1,30 @@ +/* + * 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 f08700530f..62ee16d7a0 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -29,6 +29,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavcodec/iff.h" #include "avformat.h" #define ID_8SVX MKTAG('8','S','V','X') @@ -223,8 +224,6 @@ static int iff_read_header(AVFormatContext *s, return 0; } -int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal); - static int iff_read_packet(AVFormatContext *s, AVPacket *pkt) { |