diff options
author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-12-03 00:27:01 +0000 |
---|---|---|
committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-12-03 00:27:01 +0000 |
commit | 7c3c53c851f6d686134eac48c77ae6b02d9ee92d (patch) | |
tree | ad76591672070953573b6d74a1b712aaf3d8f532 | |
parent | 38b5b47b230bb84e3d30b4683db21c396f5df3f5 (diff) | |
download | ffmpeg-7c3c53c851f6d686134eac48c77ae6b02d9ee92d.tar.gz |
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
-rw-r--r-- | Changelog | 1 | ||||
-rw-r--r-- | doc/general.texi | 2 | ||||
-rw-r--r-- | libavformat/avformat.h | 4 |
3 files changed, 5 insertions, 2 deletions
@@ -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 3afbc87591..09cd03a24a 100644 --- 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 21aad52f95..d0d9b8d221 100644 --- 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, \ |