diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:10:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:11:33 +0200 |
| commit | 69ea65b46f1a101f9a4f2c914c75b752122e7cbe (patch) | |
| tree | 19e9bfa95c01a5739802ddd1704e1486a6cbd4ad /doc/general.texi | |
| parent | a0fb6083967afcd7f2c43ab3ff1e510912644daa (diff) | |
| parent | 3e5898782dce60334ab294821ca00b19c648cf66 (diff) | |
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 3d6bf78640..0e8e410fcd 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -922,6 +922,8 @@ following image formats are supported: @tab Used in LucasArts SMUSH animations. @item Vorbis @tab E @tab X @tab A native but very primitive encoder exists. +@item Voxware MetaSound @tab @tab X + @tab imperfect and incomplete support @item WavPack @tab E @tab X @tab supported through external library libwavpack @item Westwood Audio (SND1) @tab @tab X |