summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-01-02 04:50:08 +0000
committerMike Melanson <mike@multimedia.cx>2004-01-02 04:50:08 +0000
commitda00f30e24e6ff4e339dffc3656cbf2b696b3991 (patch)
tree3c5d2380f023f93314f63ac94332364d39f91e6a
parenta7eb3c8dd158daaf134e438663b6e05cc327438b (diff)
downloadffmpeg-streaming-da00f30e24e6ff4e339dffc3656cbf2b696b3991.zip
ffmpeg-streaming-da00f30e24e6ff4e339dffc3656cbf2b696b3991.tar.gz
VMD support
Originally committed as revision 2654 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--CREDITS2
-rw-r--r--Changelog1
-rw-r--r--doc/ffmpeg-doc.texi3
3 files changed, 6 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index b22eddb..2600105 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,12 +2,14 @@ This file contains the name of the people who have contributed to
ffmpeg. The names are sorted alphabetically.
Fabrice Bellard
+BERO
Mario Brito
Alex Beregszaszi
Tim Ferguson
Brian Foley
Arpad Gereoffy
Philip Gladstone
+Vladimir Gneushev
Falk Hueffner
Zdenek Kabelac
Nick Kurshev
diff --git a/Changelog b/Changelog
index 52bf614..2a7751a 100644
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,7 @@ version <next>:
- FLIC playback support
- RealVideo 2.0 (RV20) decoder
- Duck TrueMotion v1 (DUCK) video decoder
+- Sierra VMD demuxer and video decoder
version 0.4.8:
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 99536ff..c63d019 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -653,6 +653,8 @@ library:
@tab Used in Quake II
@item FLIC format @tab @tab X
@tab .fli/.flc files
+@item Sierra VMD @tab @tab X
+@tab used in Sierra CD-ROM games
@end multitable
@code{X} means that the encoding (resp. decoding) is supported.
@@ -723,6 +725,7 @@ following image formats are supported:
@item Planar RGB @tab @tab X @tab fourcc: 8BPS
@item FLIC video @tab @tab X
@item Duck TrueMotion v1 @tab @tab X @tab fourcc: DUCK
+@item VMD Video @tab @tab X @tab used in Sierra VMD files
@end multitable
@code{X} means that the encoding (resp. decoding) is supported.
OpenPOWER on IntegriCloud