diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-10-11 17:14:02 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-10-11 17:14:02 +0000 |
| commit | dc56e0de1d14f06489d03ba5b58146e8de36aac9 (patch) | |
| tree | cdc8dfca0a94338e9ec3d306d1ab87da21461080 | |
| parent | 72450e50a58fdcc088708cf01c38de5dd5d2eb20 (diff) | |
| download | ffmpeg-dc56e0de1d14f06489d03ba5b58146e8de36aac9.tar.gz | |
update doc, changelog, and increase libavcodec version for .cin files support
Originally committed as revision 6660 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | doc/ffmpeg-doc.texi | 5 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
3 files changed, 8 insertions, 2 deletions
@@ -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 b4333be577..46148df9ff 100644 --- 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 61924bce6f..195de4b4a3 100644 --- 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) |