Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'

* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
  avcodec: Consistently name encoder init functions foo_encode_init

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/a64multienc.c
Simple merge

diff --cc libavcodec/dvenc.c
Simple merge

diff --cc libavcodec/libvorbisenc.c
index fd788b77ec72afbdc920e402e26be2cb86a0c2c9,545aa72ffb0797f923487b78f704e640d57ad57c..d5f79905b492269ccf32a97a360ef61acba6c084
--- 1/libavcodec/libvorbisenc.c
--- 2/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbisenc.c
@@@ -80,10 -85,9 +80,9 @@@ static int vorbis_error_to_averror(int 
      }
  }
  
- static av_cold int oggvorbis_init_encoder(vorbis_info *vi,
-                                           AVCodecContext *avctx)
 -static av_cold int oggvorbis_encode_init(vorbis_info *vi, AVCodecContext *avctx)
++static av_cold int oggvorbis_encode_init_internal(vorbis_info *vi, AVCodecContext *avctx)
  {
 -    OggVorbisContext *s = avctx->priv_data;
 +    OggVorbisEncContext *s = avctx->priv_data;
      double cfreq;
      int ret;
  
@@@ -200,7 -175,7 +199,7 @@@ static av_cold int oggvorbis_encode_ini
      int ret;
  
      vorbis_info_init(&s->vi);
-     if ((ret = oggvorbis_init_encoder(&s->vi, avctx))) {
 -    if ((ret = oggvorbis_encode_init(&s->vi, avctx))) {
++    if ((ret = oggvorbis_encode_init_internal(&s->vi, avctx))) {
          av_log(avctx, AV_LOG_ERROR, "encoder setup failed\n");
          goto error;
      }

diff --cc libavcodec/rawenc.c
Simple merge