summaryrefslogtreecommitdiff
path: root/libavcodec/iff.c
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-01-25 00:29:44 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-01-28 03:15:33 +0100
commit4b21c38180b2d64e3688434823769879a67e48e2 (patch)
tree8106fd05897d74e3a8b6e7cd53f1a5a8d60adb84 /libavcodec/iff.c
parentdff80041e3057004838aa500392437a6999e3b41 (diff)
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> (cherry picked from commit 2d162e3825a35b6ac42a27d27c4a3ebbd141828d)
Diffstat (limited to 'libavcodec/iff.c')
-rw-r--r--libavcodec/iff.c3
1 files changed, 1 insertions, 2 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;