diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-12 03:43:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-12 03:48:21 +0200 |
| commit | 4727ec3c0e64b9144006abf82e080fb734ad4b0a (patch) | |
| tree | c00962593119265e5dcb70fd70a2a12f623fb559 /doc | |
| parent | 13d4ec844a7e0e46da42c3ab152e5c3efe0897e3 (diff) | |
| parent | db46be01ecf44608932cfa33e8914a4c38b93431 (diff) | |
| download | ffmpeg-4727ec3c0e64b9144006abf82e080fb734ad4b0a.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
Fix compilation of timefilter test program.
Add support for AMR-WB encoding via libvo-amrwbenc
Add an AAC encoder by using the libvo-aacenc library
g722: Return 8 bits per sample for g722 in av_get_bits_per_sample
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 932e575fb6..5f75cef99c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -540,7 +540,7 @@ following image formats are supported: @item Name @tab Encoding @tab Decoding @tab Comments @item 8SVX audio @tab @tab X @item AAC @tab E @tab X - @tab encoding supported through external library libfaac + @tab encoding supported through external library libfaac and libvo-aacenc @item AC-3 @tab IX @tab X @item ADPCM 4X Movie @tab @tab X @item ADPCM CDROM XA @tab @tab X @@ -588,7 +588,8 @@ following image formats are supported: @item ADPCM Yamaha @tab X @tab X @item AMR-NB @tab E @tab X @tab encoding supported through external library libopencore-amrnb -@item AMR-WB @tab @tab X +@item AMR-WB @tab E @tab X + @tab encoding supported through external library libvo-amrwbenc @item Apple lossless audio @tab X @tab X @tab QuickTime fourcc 'alac' @item Atrac 1 @tab @tab X |