[SCM] libav/experimental: update doc, changelog, and increase libavcodec version for .cin files support
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:52:09 UTC 2013
The following commit has been merged in the experimental branch:
commit dc56e0de1d14f06489d03ba5b58146e8de36aac9
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Wed Oct 11 17:14:02 2006 +0000
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 82f7b22..fb563dc 100644
--- 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 b4333be..46148df 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
+ at item CIN @tab @tab X
+ at 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.
+ at 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
+ at item Cin Audio @tab @tab X
+ at 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 61924bc..195de4b 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)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list