Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'

* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421': proresenc: Remove unneeded parameters from encode_alpha_plane() Conflicts: libavcodec/proresenc_kostya.c See: bf10f09bcc Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 43b769b0c4
parent 3f0c76e262 b16699f2da
commit 43b769b0c4
1 changed files with 2 additions and 3 deletions
--- a/libavcodec/proresenc_kostya.c
+++ b/libavcodec/proresenc_kostya.c
@ -565,9 +565,8 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic,
            get_alpha_data(ctx, src, linesize, xp, yp,
                           pwidth, avctx->height / ctx->pictures_per_frame,
                           ctx->blocks[0], mbs_per_slice, ctx->alpha_bits);
-            sizes[i] = encode_alpha_plane(ctx, pb,
-                                          mbs_per_slice, ctx->blocks[0],
-                                          quant);
+            sizes[i] = encode_alpha_plane(ctx, pb, mbs_per_slice,
+                                          ctx->blocks[0], quant);
        }
        total_size += sizes[i];
        if (put_bits_left(pb) < 0) {