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/a64multienc.c | |
| parent | 8372aaf7210e0833b17982a3ced304c47e8f668b (diff) | |
| parent | 984e3398662d460e15904f9e4a6df9ef759070cb (diff) | |
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/a64multienc.c')
| -rw-r--r-- | libavcodec/a64multienc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 6dd5c2c2ad..af3f965213 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -195,7 +195,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; @@ -402,7 +402,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}, @@ -416,7 +416,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}, |