diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
| commit | 56efd98a6574641a32f08cd5123725cef28a309b (patch) | |
| tree | 27a85d0dc0eb40d0ad99e96bb7684514be3da44f /doc/general.texi | |
| parent | ecb815e5117f3353ed3e67bb737029773d170212 (diff) | |
| parent | e2834567d73bd1e46478ba67ac133cb8ef5f50fd (diff) | |
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 03e02c8bd8..8a73cbf5be 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -933,6 +933,7 @@ following image formats are supported: @item Musepack SV7 @tab @tab X @item Musepack SV8 @tab @tab X @item Nellymoser Asao @tab X @tab X +@item On2 AVC (Audio for Video Codec) @tab @tab X @item Opus @tab E @tab E @tab supported through external library libopus @item PCM A-law @tab X @tab X |