diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-06 18:29:51 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-02-20 04:16:15 -0800 |
| commit | 984e3398662d460e15904f9e4a6df9ef759070cb (patch) | |
| tree | 6dc35e91988fb77977013fe902bf5824542cb08c | |
| parent | 017a06a9ee86b047079166c2694c9c655ff03356 (diff) | |
| download | ffmpeg-984e3398662d460e15904f9e4a6df9ef759070cb.tar.gz | |
avcodec: Consistently name encoder init functions foo_encode_init
| -rw-r--r-- | libavcodec/a64multienc.c | 6 | ||||
| -rw-r--r-- | libavcodec/dvenc.c | 4 | ||||
| -rw-r--r-- | libavcodec/libvorbis.c | 5 | ||||
| -rw-r--r-- | libavcodec/rawenc.c | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 11d6e2c300..786074fea5 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 73c07f2c0e..590a2a9527 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 a635db39c7..545aa72ffb 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 6c90d33776..bca0d08b7a 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, }; |