diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:50:45 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:50:45 +0100 |
| commit | 90c93fb12948f0b00720df91961a09e187703060 (patch) | |
| tree | 6da306f52459e1178c7d75c058b0389b49db6d89 /doc | |
| parent | 6c9cc21bcca952ca86a6cf08376afa9f3b7a2034 (diff) | |
| parent | f023d57d355ff3b917f1aad9b03db5c293ec4244 (diff) | |
| download | ffmpeg-90c93fb12948f0b00720df91961a09e187703060.tar.gz | |
Merge commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244'
* commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244':
lavc: G.723.1 encoder
Split existing FFmpeg G.723.1 encoder into a new file.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index a10b7567f9..32c180cf3b 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -984,7 +984,7 @@ following image formats are supported: @item Enhanced AC-3 @tab X @tab X @item EVRC (Enhanced Variable Rate Codec) @tab @tab X @item FLAC (Free Lossless Audio Codec) @tab X @tab IX -@item G.723.1 @tab X @tab X +@item G.723.1 @tab X @tab X @item G.729 @tab @tab X @item GSM @tab E @tab X @tab encoding supported through external library libgsm |