diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 15:22:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 15:27:03 +0100 |
| commit | add54280bfc101b842959e5fb96260cdb0882954 (patch) | |
| tree | eb7a97a31b3eb232e15a8515b7576cfd8cdcf242 /libavcodec/libvorbisenc.c | |
| parent | 8372aaf7210e0833b17982a3ced304c47e8f668b (diff) | |
| parent | 984e3398662d460e15904f9e4a6df9ef759070cb (diff) | |
| download | ffmpeg-add54280bfc101b842959e5fb96260cdb0882954.tar.gz | |
Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'
* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
avcodec: Consistently name encoder init functions foo_encode_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvorbisenc.c')
| -rw-r--r-- | libavcodec/libvorbisenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index fd788b77ec..d5f79905b4 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -80,8 +80,7 @@ static int vorbis_error_to_averror(int ov_err) } } -static av_cold int oggvorbis_init_encoder(vorbis_info *vi, - AVCodecContext *avctx) +static av_cold int oggvorbis_encode_init_internal(vorbis_info *vi, AVCodecContext *avctx) { OggVorbisEncContext *s = avctx->priv_data; double cfreq; @@ -200,7 +199,7 @@ static av_cold int oggvorbis_encode_init(AVCodecContext *avctx) int ret; vorbis_info_init(&s->vi); - if ((ret = oggvorbis_init_encoder(&s->vi, avctx))) { + if ((ret = oggvorbis_encode_init_internal(&s->vi, avctx))) { av_log(avctx, AV_LOG_ERROR, "encoder setup failed\n"); goto error; } |