summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--Changelog1
-rw-r--r--doc/ffmpeg-doc.texi4
3 files changed, 6 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 7e5c1ef292..41bb8b9497 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,5 +1,5 @@
This file contains the name of the people who have contributed to
-ffmpeg. The names are sorted alphabetically by last name.
+FFmpeg. The names are sorted alphabetically by last name.
Michel Bardiaux
Fabrice Bellard
@@ -22,6 +22,7 @@ Todd Kirby
Nick Kurshev
Mike Melanson
Loren Merritt
+Jeff Muizelaar
Michael Niedermayer
François Revol
Måns Rullgård
diff --git a/Changelog b/Changelog
index b2fae1b949..9c30407403 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,7 @@ version <next>
- H.261 video encoder
- QPEG video decoder
- Nullsoft Video (NSV) file demuxer
+- Shorten audio decoder
version 0.4.9-pre1:
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index eb2f664373..bb79d7f464 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -657,6 +657,7 @@ library:
@item Raw MPEG video @tab X @tab X
@item Raw PCM8/16 bits, mulaw/Alaw@tab X @tab X
@item Raw CRI ADX audio @tab X @tab X
+@item Raw Shorten audio @tab @tab X
@item SUN AU format @tab X @tab X
@item NUT @tab X @tab X @tab NUT Open Container Format
@item Quicktime @tab X @tab X
@@ -833,7 +834,8 @@ solutions.
@tab used in Sierra Online game audio files
@item Apple MACE 3 @tab @tab X
@item Apple MACE 6 @tab @tab X
-@item FLAC @tab @tab X
+@item FLAC lossless audio @tab @tab X
+@item Shorten lossless audio @tab @tab X
@item FFmpeg Sonic @tab X @tab X
@tab Experimental lossy/lossless codec
@end multitable