diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:36:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:43:54 +0200 |
| commit | c40798441f47341c310b38e8f329cfb943924faf (patch) | |
| tree | c23fbec614c59bcf14c7377d1c6ff7abdfa34353 /libavcodec/vorbis_enc.c | |
| parent | c96786008172f669e546ca987e7aaa3c3469be71 (diff) | |
| parent | fd0c3403f611d31b944216cfa1585a2d28f7f0da (diff) | |
| download | ffmpeg-c40798441f47341c310b38e8f329cfb943924faf.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
make av_dup_packet() more cautious on allocation failures
make containers pass palette change in AVPacket
introduce side information for AVPacket
Politic commits that have not been pulled:
Update regtest checksums after revision 6001dad.
Replace more FFmpeg references by Libav.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis_enc.c')
| -rw-r--r-- | libavcodec/vorbis_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c index d15d3454eb..4046331a3c 100644 --- a/libavcodec/vorbis_enc.c +++ b/libavcodec/vorbis_enc.c @@ -957,7 +957,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avccontext) vorbis_enc_context *venc = avccontext->priv_data; if (avccontext->channels != 2) { - av_log(avccontext, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n"); + av_log(avccontext, AV_LOG_ERROR, "Current Libav Vorbis encoder only supports 2 channels.\n"); return -1; } |