From 353147ed5d7f26c40d7e1162f9953470e6b37bb9 Mon Sep 17 00:00:00 2001
From: Mike Melanson <mike@multimedia.cx>
Date: Sat, 20 Nov 2004 23:40:22 +0000
Subject: [PATCH] new NSV demuxer

Originally committed as revision 3697 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Changelog           | 1 +
 doc/ffmpeg-doc.texi | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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.