RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-08-18 20:01:14 +02:00
parent 3f0c76e262 b16699f2da
commit 43b769b0c4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/proresenc_kostya.c
View File

@ -565,9 +565,8 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic,
get_alpha_data(ctx, src, linesize, xp, yp, get_alpha_data(ctx, src, linesize, xp, yp,
pwidth, avctx->height / ctx->pictures_per_frame, pwidth, avctx->height / ctx->pictures_per_frame,
ctx->blocks[0], mbs_per_slice, ctx->alpha_bits); ctx->blocks[0], mbs_per_slice, ctx->alpha_bits);
sizes[i] = encode_alpha_plane(ctx, pb, sizes[i] = encode_alpha_plane(ctx, pb, mbs_per_slice,
mbs_per_slice, ctx->blocks[0], ctx->blocks[0], quant);
quant);
} }
total_size += sizes[i]; total_size += sizes[i];
if (put_bits_left(pb) < 0) { if (put_bits_left(pb) < 0) {