diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:38:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:58:19 +0200 |
commit | 82db8ee3211014a38db6b8cae03f1c3246938eee (patch) | |
tree | acac8aa9b5b38bcbcb5c34a77f076adee3c28465 /doc | |
parent | f7f5370b4b413c05f6ed848bffb85d28c5f44b9c (diff) | |
parent | fd41cb43702498948ff14ba8c284fd5c15fc729d (diff) | |
download | ffmpeg-streaming-82db8ee3211014a38db6b8cae03f1c3246938eee.zip ffmpeg-streaming-82db8ee3211014a38db6b8cae03f1c3246938eee.tar.gz |
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.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 b5f4c99..659226a 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -813,7 +813,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 Opus @tab @tab E +@item Opus @tab E @tab E @tab supported through external library libopus @item PCM A-law @tab X @tab X @item PCM mu-law @tab X @tab X |