Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavcodec / proresenc_kostya.c
similarity index 99%
rename from libavcodec/proresenc.c
rename to libavcodec/proresenc_kostya.c
index aa96b35..375dc52 100644 (file)
@@ -780,7 +780,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
     if (!avctx->coded_frame)
         return AVERROR(ENOMEM);
 
-    ff_proresdsp_init(&ctx->dsp);
+    ff_proresdsp_init(&ctx->dsp, avctx);
     ff_init_scantable(ctx->dsp.dct_permutation, &ctx->scantable,
                       ff_prores_progressive_scan);
 
@@ -874,8 +874,8 @@ static const AVClass proresenc_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-AVCodec ff_prores_encoder = {
-    .name           = "prores",
+AVCodec ff_prores_kostya_encoder = {
+    .name           = "prores_kostya",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_PRORES,
     .priv_data_size = sizeof(ProresContext),