diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:45:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:45:00 +0200 |
| commit | 35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c (patch) | |
| tree | 5c4bdb61ca0673b0644ad904740acaf39964b1db | |
| parent | 9e6d8c309f2763364ca2aaab801963a302bdfe82 (diff) | |
| parent | b3f48a5044fd04539337e91d28022207c9d3b9e8 (diff) | |
| download | ffmpeg-35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c.tar.gz | |
Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2
* commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8':
proresenc: Remove unneeded parameters from encode_alpha_plane()
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 463056c962..1729758ed1 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -566,9 +566,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) { |