diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-10-25 10:14:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-25 15:04:51 +0200 |
| commit | cf88cf17d0c6bd745f3e57e5e562ad2badf45dc1 (patch) | |
| tree | 14324675d9584fc60dd894fd09d90612971e90e7 | |
| parent | 02ac6a654457122d67b0c1e8abf04902147954c8 (diff) | |
| download | ffmpeg-cf88cf17d0c6bd745f3e57e5e562ad2badf45dc1.tar.gz | |
Remove CELT / Opus confusion in labels, doc and comments.
The situation was not clear when support was added but it is now:
CELT and Opus are really two different codecs.
The current code supports CELT via libcelt, not Opus.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | libavcodec/libcelt_dec.c | 4 | ||||
| -rw-r--r-- | libavformat/oggparsecelt.c | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -162,7 +162,7 @@ Configuration options: External library support: --enable-avisynth enable reading of AVISynth script files [no] --enable-bzlib enable bzlib [autodetect] - --enable-libcelt enable CELT/Opus decoding via libcelt [no] + --enable-libcelt enable CELT decoding via libcelt [no] --enable-frei0r enable frei0r video filtering --enable-libaacplus enable AAC+ encoding via libaacplus [no] --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] diff --git a/doc/general.texi b/doc/general.texi index 3ba3c58f47..eb2545352c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -619,7 +619,7 @@ following image formats are supported: @item Atrac 3 @tab @tab X @item Bink Audio @tab @tab X @tab Used in Bink and Smacker files in many games. -@item CELT (Opus) @tab @tab E +@item CELT @tab @tab E @tab decoding supported through external library libcelt @item Delphine Software International CIN audio @tab @tab X @tab Codec used in Delphine Software International games. diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index de126c8c81..8b8863ae4a 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -1,5 +1,5 @@ /* - * Xiph CELT / Opus decoder using libcelt + * Xiph CELT decoder using libcelt * Copyright (c) 2011 Nicolas George * * This file is part of FFmpeg. @@ -133,5 +133,5 @@ AVCodec ff_libcelt_decoder = { .close = libcelt_dec_close, .decode = libcelt_dec_decode, .capabilities = 0, - .long_name = NULL_IF_CONFIG_SMALL("Xiph CELT/Opus decoder using libcelt"), + .long_name = NULL_IF_CONFIG_SMALL("Xiph CELT decoder using libcelt"), }; diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c index 0af6fccfa2..982d3d7ea5 100644 --- a/libavformat/oggparsecelt.c +++ b/libavformat/oggparsecelt.c @@ -1,5 +1,5 @@ /* - * Xiph CELT / Opus parser for Ogg + * Xiph CELT parser for Ogg * Copyright (c) 2011 Nicolas George * * This file is part of FFmpeg. |