diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 02:16:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 02:17:56 +0200 |
| commit | 6c019f05ed5333037e192e8c84d047321fc3629a (patch) | |
| tree | 4a4bb164de880b131240afc9ad7c829963d10ac7 /doc | |
| parent | 1752b1459d09d822e2765497416c7dd66e6a875b (diff) | |
| parent | 718907cd881a0b593264aed059c0e00da13f9e15 (diff) | |
| download | ffmpeg-6c019f05ed5333037e192e8c84d047321fc3629a.tar.gz | |
Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'
* commit '718907cd881a0b593264aed059c0e00da13f9e15':
libtwolame MP2 encoding support
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/libtwolame.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 585ed8c12e..b486d08503 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -920,7 +920,7 @@ following image formats are supported: @item Monkey's Audio @tab @tab X @item MP1 (MPEG audio layer 1) @tab @tab IX @item MP2 (MPEG audio layer 2) @tab IX @tab IX - @tab libtwolame can be used alternatively for encoding. + @tab encoding supported also through external library TwoLAME @item MP3 (MPEG audio layer 3) @tab E @tab IX @tab encoding supported through external library LAME, ADU MP3 and MP3onMP4 also supported @item MPEG-4 Audio Lossless Coding (ALS) @tab @tab X |