[FFmpeg-cvslog] Revert "vc2enc: Calculate average slice quantiser correctly"

[Kieran Kunhya]

ffmpeg | branch: master | Kieran Kunhya <kierank at obe.tv> | Sat Nov  4 18:31:59 2017 +0000| [1358f7ddb3a0b3ebbf2c6100fb31c2c4788b7458] | committer: Kieran Kunhya

Revert "vc2enc: Calculate average slice quantiser correctly"

This reverts commit 626d200e76e15487cff20992256a55919432b0b3.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1358f7ddb3a0b3ebbf2c6100fb31c2c4788b7458
---

 libavcodec/vc2enc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c
index f7fb17b076..96e27d93ed 100644
--- a/libavcodec/vc2enc.c
+++ b/libavcodec/vc2enc.c
@@ -167,7 +167,7 @@ typedef struct VC2EncContext {
     int slice_max_bytes;
     int slice_min_bytes;
     int q_ceil;
-    int64_t q_avg;
+    int q_avg;
 
     /* Options */
     double tolerance;
@@ -755,7 +755,7 @@ static int calc_slice_sizes(VC2EncContext *s)
     for (i = 0; i < s->num_x*s->num_y; i++) {
         SliceArgs *args = &enc_args[i];
         total_bytes_needed += args->bytes;
-        s->q_avg += args->quant_idx;
+        s->q_avg = (s->q_avg + args->quant_idx)/2;
     }
 
     return total_bytes_needed;
@@ -1045,7 +1045,7 @@ static av_cold int vc2_encode_end(AVCodecContext *avctx)
     int i;
     VC2EncContext *s = avctx->priv_data;
 
-    av_log(avctx, AV_LOG_INFO, "Qavg: %f\n", (float)s->q_avg / (s->num_x*s->num_y));
+    av_log(avctx, AV_LOG_INFO, "Qavg: %i\n", s->q_avg);
 
     for (i = 0; i < 3; i++) {
         ff_vc2enc_free_transforms(&s->transform_args[i].t);