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 <[email protected]>
SaschaVasarrhelyi · Jan 26, 2011 · 2d162e3 · 2d162e3
1 parent 4c57cde
commit 2d162e3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 33 deletions.
diff --git 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
diff --git 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')