[SCM] libav/experimental: Segregate code common to BMP decoder and future encoder patch by Michel Bardiaux, mbardiaux mediaxim be

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 76ebb18f1679ee48e6d280b39467a643e1e7d68e
Author: Michel Bardiaux <mbardiaux at peaktime.be>
Date:   Sat Jan 27 07:39:16 2007 +0000

    Segregate code common to BMP decoder and future encoder
    patch by Michel Bardiaux, mbardiaux mediaxim be
    
    Originally committed as revision 7721 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index f286aeb..e621c68 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -1,5 +1,5 @@
 /*
- * BMP image format
+ * BMP image format decoder
  * Copyright (c) 2005 Mans Rullgard
  *
  * This file is part of FFmpeg.
@@ -22,17 +22,7 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "bswap.h"
-
-typedef struct BMPContext {
-    AVFrame picture;
-} BMPContext;
-
-typedef enum {
-    BMP_RGB         =0,
-    BMP_RLE8        =1,
-    BMP_RLE4        =2,
-    BMP_BITFIELDS   =3,
-} BiCompression;
+#include "bmp.h"
 
 #define read16(bits) bswap_16(get_bits(bits, 16))
 #define read32(bits) bswap_32(get_bits_long(bits, 32))
diff --git a/libavformat/gxf.h b/libavcodec/bmp.h
similarity index 75%
copy from libavformat/gxf.h
copy to libavcodec/bmp.h
index 0e2a31c..cf6ace8 100644
--- a/libavformat/gxf.h
+++ b/libavcodec/bmp.h
@@ -1,6 +1,6 @@
 /*
- * GXF demuxer
- * copyright (c) 2006 Reimar Doeffinger
+ * internals for BMP codecs
+ * Copyright (c) 2005 Mans Rullgard
  *
  * This file is part of FFmpeg.
  *
@@ -19,16 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_GXF_H
-#define FFMPEG_GXF_H
+typedef struct BMPContext {
+    AVFrame picture;
+} BMPContext;
 
-/* gxf.c */
 typedef enum {
-    PKT_MAP = 0xbc,
-    PKT_MEDIA = 0xbf,
-    PKT_EOS = 0xfb,
-    PKT_FLT = 0xfc,
-    PKT_UMF = 0xfd
-} pkt_type_t;
-
-#endif /* FFMPEG_GXF_H */
+    BMP_RGB         =0,
+    BMP_RLE8        =1,
+    BMP_RLE4        =2,
+    BMP_BITFIELDS   =3,
+} BiCompression;

-- 
Libav/FFmpeg packaging