[FFmpeg-cvslog] commit: Missing parts of IVF muxer support. ( Reimar Döffinger )

[git at videolan.org]

ffmpeg | branch: master | Reimar D?ffinger <Reimar.Doeffinger at gmx.de> | Tue Jan 18 07:59:49 2011 +0100| [54bc6403620286f595becd01842947395020e2f4] | committer: Reimar D?ffinger 

Missing parts of IVF muxer support.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54bc6403620286f595becd01842947395020e2f4
---

 Changelog                |    1 +
 doc/general.texi         |    2 +-
 libavformat/Makefile     |    1 +
 libavformat/allformats.c |    2 +-
 libavformat/avformat.h   |    2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 2e99fa4..8b7efb6 100644
--- a/Changelog
+++ b/Changelog
@@ -73,6 +73,7 @@ version <next>:
 - floating-point AC-3 encoder added
 - Lagarith decoder
 - ffmpeg -copytb option added
+- IVF muxer added
 
 
 version 0.6:
diff --git a/doc/general.texi b/doc/general.texi
index cbdc679..c1fecef 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -110,7 +110,7 @@ library:
     @tab Format used in various Interplay computer games.
 @item IV8                       @tab   @tab X
     @tab A format generated by IndigoVision 8000 video server.
- at item IVF (On2)                 @tab   @tab X
+ at item IVF (On2)                 @tab X @tab X
     @tab A format used by libvpx
 @item LMLM4                     @tab   @tab X
     @tab Used by Linux Media Labs MPEG-4 PCI boards
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 67462c4..d3c849a 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -109,6 +109,7 @@ OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
 OBJS-$(CONFIG_ISS_DEMUXER)               += iss.o
 OBJS-$(CONFIG_IV8_DEMUXER)               += iv8.o
 OBJS-$(CONFIG_IVF_DEMUXER)               += ivfdec.o riff.o
+OBJS-$(CONFIG_IVF_MUXER)                 += ivfenc.o
 OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
 OBJS-$(CONFIG_LXF_DEMUXER)               += lxfdec.o
 OBJS-$(CONFIG_M4V_DEMUXER)               += m4vdec.o rawdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index d543ad1..5fa97ef 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -109,7 +109,7 @@ void av_register_all(void)
     REGISTER_MUXER    (IPOD, ipod);
     REGISTER_DEMUXER  (ISS, iss);
     REGISTER_DEMUXER  (IV8, iv8);
-    REGISTER_DEMUXER  (IVF, ivf);
+    REGISTER_MUXDEMUX (IVF, ivf);
     REGISTER_DEMUXER  (LMLM4, lmlm4);
     REGISTER_DEMUXER  (LXF, lxf);
     REGISTER_MUXDEMUX (M4V, m4v);
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 919933f..b484649 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 93
+#define LIBAVFORMAT_VERSION_MINOR 94
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \