[SCM] libav/experimental: Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2d162e3825a35b6ac42a27d27c4a3ebbd141828d
Author: Diego Elio Pettenò <flameeyes at gmail.com>
Date:   Tue Jan 25 00:29:44 2011 +0000

    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 at mansr.com>

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 19f4172..aeff0b5 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 76db10b..0000000
--- a/libavcodec/iff.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * IFF PBM/ILBM bitmap decoder
- * Copyright (c) 2010 Peter Ross <pross at 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 e1afefb..e871956 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')

-- 
Libav/FFmpeg packaging