Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 00:45:00 +0000 (02:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 00:45:00 +0000 (02:45 +0200)
* commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8':
  proresenc: Remove unneeded parameters from encode_alpha_plane()

Conflicts:
libavcodec/proresenc_kostya.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/proresenc_kostya.c

@@@ -566,16 -561,10 +566,15 @@@ static int encode_slice(AVCodecContext 
              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) {
 +            av_log(avctx, AV_LOG_ERROR, "Serious underevaluation of"
 +                   "required buffer size");
 +            return AVERROR_BUFFER_TOO_SMALL;
 +        }
      }
      return total_size;
  }