[SCM] libav/master: proresenc: Remove unneeded parameters from encode_alpha_plane()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Sep 17 01:18:06 UTC 2014


The following commit has been merged in the master branch:
commit b16699f2da9c1d41eff852ec3a0c81f74fd44421
Author: Christophe Gisquet <christophe.gisquet at gmail.com>
Date:   Mon Aug 18 14:15:21 2014 +0000

    proresenc: Remove unneeded parameters from encode_alpha_plane()
    
    Signed-off-by: Diego Biurrun <diego at biurrun.de>
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index bdb826c..6acaede 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -468,7 +468,6 @@ static void put_alpha_run(PutBitContext *pb, int run)
 
 // todo alpha quantisation for high quants
 static int encode_alpha_plane(ProresContext *ctx, PutBitContext *pb,
-                              const uint16_t *src, int linesize,
                               int mbs_per_slice, uint16_t *blocks,
                               int quant)
 {
@@ -563,9 +562,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, src, linesize,
-                                          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];
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list