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/dvenc.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/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 6e887dc840..3efe53a838 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. " @@ -702,7 +702,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, |