[libav-devel] [PATCH 4/5] avcodec: Consistently name encoder init functions foo_encode_init

[Diego Biurrun]

---
 libavcodec/a64multienc.c | 6 +++---
 libavcodec/dvenc.c       | 4 ++--
 libavcodec/libvorbis.c   | 5 ++---
 libavcodec/rawenc.c      | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
index 11d6e2c..786074f 100644
--- a/libavcodec/a64multienc.c
+++ b/libavcodec/a64multienc.c
@@ -174,7 +174,7 @@ static av_cold int a64multi_close_encoder(AVCodecContext 
*avctx)
     return 0;
 }
 
-static av_cold int a64multi_init_encoder(AVCodecContext *avctx)
+static av_cold int a64multi_encode_init(AVCodecContext *avctx)
 {
     A64Context *c = avctx->priv_data;
     int a;
@@ -382,7 +382,7 @@ AVCodec ff_a64multi_encoder = {
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_A64_MULTI,
     .priv_data_size = sizeof(A64Context),
-    .init           = a64multi_init_encoder,
+    .init           = a64multi_encode_init,
     .encode2        = a64multi_encode_frame,
     .close          = a64multi_close_encoder,
     .pix_fmts       = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, 
AV_PIX_FMT_NONE},
@@ -395,7 +395,7 @@ AVCodec ff_a64multi5_encoder = {
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_A64_MULTI5,
     .priv_data_size = sizeof(A64Context),
-    .init           = a64multi_init_encoder,
+    .init           = a64multi_encode_init,
     .encode2        = a64multi_encode_frame,
     .close          = a64multi_close_encoder,
     .pix_fmts       = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, 
AV_PIX_FMT_NONE},
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 73c07f2..590a2a9 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -33,7 +33,7 @@
 #include "dv.h"
 #include "dv_tablegen.h"
 
-static av_cold int dvvideo_init_encoder(AVCodecContext *avctx)
+static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
 {
     if (!avpriv_dv_codec_profile(avctx)) {
         av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. "
@@ -699,7 +699,7 @@ AVCodec ff_dvvideo_encoder = {
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_DVVIDEO,
     .priv_data_size = sizeof(DVVideoContext),
-    .init           = dvvideo_init_encoder,
+    .init           = dvvideo_encode_init,
     .encode2        = dvvideo_encode_frame,
     .close          = dvvideo_encode_close,
     .capabilities   = CODEC_CAP_SLICE_THREADS,
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index a635db3..545aa72 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -85,8 +85,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(vorbis_info *vi, AVCodecContext 
*avctx)
 {
     OggVorbisContext *s = avctx->priv_data;
     double cfreq;
@@ -176,7 +175,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(&s->vi, avctx))) {
         av_log(avctx, AV_LOG_ERROR, "encoder setup failed\n");
         goto error;
     }
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index 6c90d33..bca0d08 100644
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -31,7 +31,7 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/internal.h"
 
-static av_cold int raw_init_encoder(AVCodecContext *avctx)
+static av_cold int raw_encode_init(AVCodecContext *avctx)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
 
@@ -75,6 +75,6 @@ AVCodec ff_rawvideo_encoder = {
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_RAWVIDEO,
     .priv_data_size = sizeof(AVFrame),
-    .init           = raw_init_encoder,
+    .init           = raw_encode_init,
     .encode2        = raw_encode,
 };
-- 
1.8.3.2

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel