update doc, changelog, and increase libavcodec version for .cin files support

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

diff --git a/Changelog b/Changelog
index 82f7b221f6033f440dff4990557c38b4f6646439..fb563dc386adddd7e6c763cb40e8c5cc000557b7 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -60,6 +60,7 @@ version <next>
 - VP6 video decoder
 - WavPack lossless audio decoder
 - Targa (.TGA) picture decoder
+- Delphine Software .cin demuxer/audio and video decoder
 
 version 0.4.9-pre1:
 

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b4333be5773102138ed861578fef6a7ca6d8f175..46148df9ffb93f8d7620f17565f441da0c3a5e92 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -735,6 +735,8 @@ library:
 @item Smacker @tab    @tab X
 @tab Multimedia format used by many games.
 @item GXF @tab    @tab X
+@item CIN @tab    @tab X
+@tab Multimedia format used by Delphine Software games.
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
@@ -837,6 +839,7 @@ following image formats are supported:
 @item RTjpeg                 @tab     @tab  X @tab Video encoding used in NuppelVideo files.
 @item KMVC                   @tab     @tab  X @tab Codec used in Worms games.
 @item VMware Video           @tab     @tab  X @tab Codec used in videos captured by VMware.
+@item Cin Video              @tab     @tab  X @tab Codec used in Delphine Software games.
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
@@ -910,6 +913,8 @@ following image formats are supported:
 @item True Audio (TTA)       @tab      @tab X
 @item Smacker Audio          @tab      @tab X
 @item WavPack Audio          @tab      @tab X
+@item Cin Audio              @tab      @tab X
+@tab Codec used in Delphine Software games.
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 61924bce6f7b5527f17b9fc21cef10867cf21fc9..195de4b4a3f7b527a1dd5f1f24521ad7d8ea4858 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -37,8 +37,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(17<<8)+0)
-#define LIBAVCODEC_VERSION      51.17.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(18<<8)+0)
+#define LIBAVCODEC_VERSION      51.18.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)