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 /libavcodec/libopus.h | |
| parent | f7f5370b4b413c05f6ed848bffb85d28c5f44b9c (diff) | |
| parent | fd41cb43702498948ff14ba8c284fd5c15fc729d (diff) | |
| download | ffmpeg-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 'libavcodec/libopus.h')
| -rw-r--r-- | libavcodec/libopus.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libavcodec/libopus.h b/libavcodec/libopus.h new file mode 100644 index 0000000000..a8223d1d6f --- /dev/null +++ b/libavcodec/libopus.h @@ -0,0 +1,27 @@ +/* + * libopus encoder/decoder common code + * Copyright (c) 2012 Nicolas George + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_LIBOPUS_H +#define AVCODEC_LIBOPUS_H + +int ff_opus_error_to_averror(int err); + +#endif /* AVCODEC_LIBOPUS_H */ |