new NSV demuxer

Originally committed as revision 3697 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index fa3a155..b2fae1b 100644 (file)
--- 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 3e1ee93..e0caed0 100644 (file)
--- 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.