Update Changelog, documentation, and libavformat minor version number for

"A format generated by IndigoVision 8000 video server" added in r20681.

Originally committed as revision 20712 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index 9bea64f..838f24d 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -43,6 +43,7 @@ version <next>:
 - RF64 support in WAV demuxer
 - MPEG-4 Audio Lossless Coding (ALS) decoder
 - -formats option split into -formats, -codecs, -bsfs, and -protocols
+- IV8 demuxer
 
 
 

diff --git a/doc/general.texi b/doc/general.texi
index 3afbc87..09cd03a 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -101,6 +101,8 @@ library:
     @tab Interchange File Format
 @item Interplay MVE             @tab   @tab X
     @tab Format used in various Interplay computer games.
+@item IV8                       @tab   @tab X
+    @tab A format generated by IndigoVision 8000 video server.
 @item LMLM4                     @tab   @tab X
     @tab Used by Linux Media Labs MPEG-4 PCI boards
 @item Matroska                  @tab X @tab X

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 21aad52..d0d9b8d 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,8 +22,8 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 39
-#define LIBAVFORMAT_VERSION_MICRO  2
+#define LIBAVFORMAT_VERSION_MINOR 40
+#define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \