aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-11-20 23:40:22 +0000
committerMike Melanson <mike@multimedia.cx>2004-11-20 23:40:22 +0000
commit353147ed5d7f26c40d7e1162f9953470e6b37bb9 (patch)
treec5c7b1d95a61f911c58bdda2db083fd9eb0fae04
parent27d5f18f663a240a0a1d1833ea6eefa3463cf323 (diff)
downloadffmpeg-353147ed5d7f26c40d7e1162f9953470e6b37bb9.tar.gz
new NSV demuxer
Originally committed as revision 3697 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--doc/ffmpeg-doc.texi3
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index fa3a1553dd..b2fae1b949 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ version <next>
- Miro VideoXL (VIXL) video decoder
- H.261 video encoder
- QPEG video decoder
+- Nullsoft Video (NSV) file demuxer
version 0.4.9-pre1:
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 3e1ee93af8..e0caed02f5 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -686,9 +686,10 @@ library:
@item Sierra Online @tab @tab X
@tab .sol files used in Sierra Online games
@item Matroska @tab @tab X
-@end multitable
@item Electronic Arts Multimedia @tab @tab X
@tab used in various EA games; files have extensions like WVE and UV2
+@item Nullsoft Video (NSV) format @tab @tab X
+@end multitable
@code{X} means that the encoding (resp. decoding) is supported.