summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Shaposhnik <roman@shaposhnik.org>2004-02-07 08:24:24 +0000
committerRoman Shaposhnik <roman@shaposhnik.org>2004-02-07 08:24:24 +0000
commitd4e437df360ddd74c6aca7159e9923504e272f88 (patch)
tree653a13a878aa3b06cc6537f6cdc46b7b2a16770f
parente5966052ee7e07c30a078f31141e3e068847fc7a (diff)
downloadffmpeg-streaming-d4e437df360ddd74c6aca7159e9923504e272f88.zip
ffmpeg-streaming-d4e437df360ddd74c6aca7159e9923504e272f88.tar.gz
* docs update for G.726
Originally committed as revision 2760 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--CREDITS1
-rw-r--r--doc/ffmpeg-doc.texi1
2 files changed, 2 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index d5a50df..2e245d0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -17,6 +17,7 @@ Nick Kurshev
Mike Melanson
Michael Niedermayer
François Revol
+Roman Shaposhnik
Dieter Shirley
Juan J. Sierralta
Ewald Snel
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 6d8c343..d133840 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -753,6 +753,7 @@ solutions.
@item MS IMA ADPCM @tab X @tab X
@item QT IMA ADPCM @tab @tab X
@item 4X IMA ADPCM @tab @tab X
+@item G.726 ADPCM @tab X @tab X
@item Duck DK3 IMA ADPCM @tab @tab X
@tab used in some Sega Saturn console games
@item Duck DK4 IMA ADPCM @tab @tab X
OpenPOWER on IntegriCloud