Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-20 18:22:37 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-02-20 18:27:03 +0400
commitadd54280bfc101b842959e5fb96260cdb0882954 (patch)
treeeb7a97a31b3eb232e15a8515b7576cfd8cdcf242 /libavcodec/rawenc.c
parent8372aaf7210e0833b17982a3ced304c47e8f668b (diff)
parent984e3398662d460e15904f9e4a6df9ef759070cb (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/rawenc.c')
-rw-r--r--libavcodec/rawenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index 036261d1ec..c5d3d2e955 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,
};