[Ffmpeg-cvslog] CVS: ffmpeg/libavformat Makefile, 1.115, 1.116 allformats.c, 1.55, 1.56 avformat.h, 1.139, 1.140 avio.h, 1.23, 1.24 aviobuf.c, 1.35, 1.36

[Aurelien Jacobs CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv27928/libavformat

Modified Files:
	Makefile allformats.c avformat.h avio.h aviobuf.c 
Log Message:
add a Creative VOC (de)muxer

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- Makefile	2 Feb 2006 15:21:19 -0000	1.115
+++ Makefile	9 Feb 2006 22:50:22 -0000	1.116
@@ -22,7 +22,8 @@
       yuv4mpeg.o 4xm.o flvdec.o psxstr.o idroq.o ipmovie.o \
       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
       sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
-      ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o
+      ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o \
+      voc.o
 
 # muxers
 ifeq ($(CONFIG_MUXERS),yes)

Index: allformats.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- allformats.c	2 Feb 2006 15:21:19 -0000	1.55
+++ allformats.c	9 Feb 2006 22:50:22 -0000	1.56
@@ -114,6 +114,7 @@
     ea_init();
     nsvdec_init();
     daud_init();
+    voc_init();
 
 #ifdef CONFIG_MUXERS
     /* image formats */

Index: avformat.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- avformat.h	8 Feb 2006 01:11:48 -0000	1.139
+++ avformat.h	9 Feb 2006 22:50:22 -0000	1.140
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#define LIBAVFORMAT_VERSION_INT ((50<<16)+(1<<8)+0)
-#define LIBAVFORMAT_VERSION     50.1.0
+#define LIBAVFORMAT_VERSION_INT ((50<<16)+(2<<8)+0)
+#define LIBAVFORMAT_VERSION     50.2.0
 #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
 
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
@@ -552,6 +552,9 @@
 /* aiff.c */
 int ff_aiff_init(void);
 
+/* voc.c */
+int voc_init(void);
+
 #include "rtp.h"
 
 #include "rtsp.h"

Index: avio.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avio.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- avio.h	17 Dec 2005 18:14:36 -0000	1.23
+++ avio.h	9 Feb 2006 22:50:22 -0000	1.24
@@ -99,6 +99,7 @@
 void put_be64(ByteIOContext *s, uint64_t val);
 void put_le32(ByteIOContext *s, unsigned int val);
 void put_be32(ByteIOContext *s, unsigned int val);
+void put_le24(ByteIOContext *s, unsigned int val);
 void put_be24(ByteIOContext *s, unsigned int val);
 void put_le16(ByteIOContext *s, unsigned int val);
 void put_be16(ByteIOContext *s, unsigned int val);
@@ -127,6 +128,7 @@
 int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
 int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
 int get_byte(ByteIOContext *s);
+unsigned int get_le24(ByteIOContext *s);
 unsigned int get_le32(ByteIOContext *s);
 uint64_t get_le64(ByteIOContext *s);
 unsigned int get_le16(ByteIOContext *s);

Index: aviobuf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/aviobuf.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- aviobuf.c	21 Jan 2006 18:36:32 -0000	1.35
+++ aviobuf.c	9 Feb 2006 22:50:22 -0000	1.36
@@ -239,6 +239,12 @@
     put_byte(s, val);
 }
 
+void put_le24(ByteIOContext *s, unsigned int val)
+{
+    put_le16(s, val & 0xffff);
+    put_byte(s, val >> 16);
+}
+
 void put_be24(ByteIOContext *s, unsigned int val)
 {
     put_be16(s, val >> 8);
@@ -396,6 +402,14 @@
     return val;
 }
 
+unsigned int get_le24(ByteIOContext *s)
+{
+    unsigned int val;
+    val = get_le16(s);
+    val |= get_byte(s) << 16;
+    return val;
+}
+
 unsigned int get_le32(ByteIOContext *s)
 {
     unsigned int val;