[FFmpeg-cvslog] r22307 - in trunk: libavcodec/iff.c libavcodec/iff.h libavformat/iff.c

[mru]

Author: mru
Date: Mon Mar  8 03:36:00 2010
New Revision: 22307

Log:
IFF: move ff_cmap_read_palette() prototype to a header file

Added:
   trunk/libavcodec/iff.h
Modified:
   trunk/libavcodec/iff.c
   trunk/libavformat/iff.c

Modified: trunk/libavcodec/iff.c
==============================================================================
--- trunk/libavcodec/iff.c	Mon Mar  8 01:40:22 2010	(r22306)
+++ trunk/libavcodec/iff.c	Mon Mar  8 03:36:00 2010	(r22307)
@@ -27,6 +27,7 @@
 #include "bytestream.h"
 #include "avcodec.h"
 #include "get_bits.h"
+#include "iff.h"
 
 typedef struct {
     AVFrame frame;

Added: trunk/libavcodec/iff.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavcodec/iff.h	Mon Mar  8 03:36:00 2010	(r22307)
@@ -0,0 +1,30 @@
+/*
+ * 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 */

Modified: trunk/libavformat/iff.c
==============================================================================
--- trunk/libavformat/iff.c	Mon Mar  8 01:40:22 2010	(r22306)
+++ trunk/libavformat/iff.c	Mon Mar  8 03:36:00 2010	(r22307)
@@ -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(AVFormatConte
     return 0;
 }
 
-int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal);
-
 static int iff_read_packet(AVFormatContext *s,
                            AVPacket *pkt)
 {