virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove CELT / Opus confusion in labels, doc and comments.

Browse Source 
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>
This commit is contained in:
Nicolas George 2011-10-25 10:14:34 +02:00 committed by Michael Niedermayer
parent 02ac6a6544
commit cf88cf17d0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -162,7 +162,7 @@ Configuration options:
External library support: External library support:
--enable-avisynth enable reading of AVISynth script files [no] --enable-avisynth enable reading of AVISynth script files [no]
--enable-bzlib enable bzlib [autodetect] --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-frei0r enable frei0r video filtering
--enable-libaacplus enable AAC+ encoding via libaacplus [no] --enable-libaacplus enable AAC+ encoding via libaacplus [no]
--enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]

2
doc/general.texi
View File

@ -619,7 +619,7 @@ following image formats are supported:
@item Atrac 3 @tab @tab X @item Atrac 3 @tab @tab X
@item Bink Audio @tab @tab X @item Bink Audio @tab @tab X
@tab Used in Bink and Smacker files in many games. @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 @tab decoding supported through external library libcelt
@item Delphine Software International CIN audio @tab @tab X @item Delphine Software International CIN audio @tab @tab X
@tab Codec used in Delphine Software International games. @tab Codec used in Delphine Software International games.

4
libavcodec/libcelt_dec.c
View File

@ -1,5 +1,5 @@
/* /*
* Xiph CELT / Opus decoder using libcelt * Xiph CELT decoder using libcelt
* Copyright (c) 2011 Nicolas George * Copyright (c) 2011 Nicolas George
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
@ -133,5 +133,5 @@ AVCodec ff_libcelt_decoder = {
.close = libcelt_dec_close, .close = libcelt_dec_close,
.decode = libcelt_dec_decode, .decode = libcelt_dec_decode,
.capabilities = 0, .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"),
}; };

2
libavformat/oggparsecelt.c
View File

@ -1,5 +1,5 @@
/* /*
* Xiph CELT / Opus parser for Ogg * Xiph CELT parser for Ogg
* Copyright (c) 2011 Nicolas George * Copyright (c) 2011 Nicolas George
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.