aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-18 20:01:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-18 20:01:14 +0200
commit43b769b0c4f438d3f261d53f7fbd23e28606e78a (patch)
treeca63a9d92896b2d540eeaa375119c0ec0d0fa390
parent3f0c76e26205f867b089ac56d7cb14bf8d984ef0 (diff)
parentb16699f2da9c1d41eff852ec3a0c81f74fd44421 (diff)
downloadffmpeg-43b769b0c4f438d3f261d53f7fbd23e28606e78a.tar.gz
Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'
* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421': proresenc: Remove unneeded parameters from encode_alpha_plane() Conflicts: libavcodec/proresenc_kostya.c See: bf10f09bccdcfdb41b9f5bbae01d55961bfd0693 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/proresenc_kostya.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c
index c3c2363109..bb40a55f63 100644
--- 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) {