[SCM] libav/experimental: IFF: move ff_cmap_read_palette() prototype to a header file

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d9747e29b657f6d999327ee2f2e48a0fe176b87c
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Mar 8 02:36:00 2010 +0000

    IFF: move ff_cmap_read_palette() prototype to a header file
    
    Originally committed as revision 22307 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index a8e6426..490d347 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/cga_data.h b/libavcodec/iff.h
similarity index 76%
copy from libavcodec/cga_data.h
copy to libavcodec/iff.h
index c3f69f1..76db10b 100644
--- a/libavcodec/cga_data.h
+++ b/libavcodec/iff.h
@@ -1,5 +1,6 @@
 /*
- * CGA ROM data
+ * IFF PBM/ILBM bitmap decoder
+ * Copyright (c) 2010 Peter Ross <pross at xvid.org>
  *
  * This file is part of FFmpeg.
  *
@@ -18,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_CGA_DATA_H
-#define AVCODEC_CGA_DATA_H
+#ifndef AVCODEC_IFF_H
+#define AVCODEC_IFF_H
 
 #include <stdint.h>
+#include "avcodec.h"
 
-extern const uint8_t ff_cga_font[2048];
-extern const uint32_t ff_cga_palette[16];
+int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal);
 
-#endif
+#endif /* AVCODEC_IFF_H */
diff --git a/libavformat/iff.c b/libavformat/iff.c
index f087005..62ee16d 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)
 {

-- 
Libav/FFmpeg packaging