Compile the transrate module (untested ... but now it compiles).

[vlc] / modules / stream_out / transrate / block.c

diff --git a/modules/stream_out/transrate/block.c b/modules/stream_out/transrate/block.c
index 6d0e1d90f0bec3acdeea7e073e5143d36d537ca2..e22eb1b78b5b5868044896957c30add873d37714 100644 (file)
--- a/modules/stream_out/transrate/block.c
+++ b/modules/stream_out/transrate/block.c
@@ -31,15 +31,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
 #define NDEBUG 1
 #include <assert.h>
 #include <math.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_sout.h>
-#include <<vlc_input.h>>
+#include <vlc_codec.h>
 
 #include "transrate.h"
 
@@ -70,10 +72,10 @@ static int64_t get_score( const RunLevel *blk, RunLevel *new_blk, int i_qscale,
     {
         int new_level = new_blk->level;
         int level = blk->level;
-       if ( i1 > 64 || i2 > 64 || !blk->run || !new_blk->run ) return score;
+    if ( i1 > 64 || i2 > 64 || !blk->run || !new_blk->run ) return score;
         if ( i1 + blk->run == i2 + new_blk->run )
         {
-            int64_t tmp = saturate(level * i_qscale) 
+            int64_t tmp = saturate(level * i_qscale)
                             - saturate(new_level * i_qscale_new);
             i1 += blk->run;
             i2 += new_blk->run;
@@ -147,7 +149,7 @@ static const uint8_t map_non_linear_mquant[113] =
 
 int scale_quant( transrate_t *tr, double qrate )
 {
-    int i_quant = (int)floor( tr->quantizer_scale * qrate + 0.5 );
+    int i_quant = floor( tr->quantizer_scale * qrate + 0.5 );
 
     if ( tr->q_scale_type )
     {
@@ -169,7 +171,7 @@ int scale_quant( transrate_t *tr, double qrate )
     return i_quant;
 }
 
-int increment_quant( transrate_t *tr, int i_quant )
+static int increment_quant( transrate_t *tr, int i_quant )
 {
     if ( tr->q_scale_type )
     {
@@ -528,7 +530,7 @@ void get_intra_block_B14( transrate_t *tr, RunLevel *blk )
             if (i < 64 ) goto normal_code;
         }
         fprintf(stderr, "Err in B14\n");
-       tr->b_error = 1;
+    tr->b_error = 1;
         break;  /* illegal, check needed to avoid buffer overflow */
     }
     bs_flush( bs, 2 );    /* dump end of block code */
@@ -612,7 +614,7 @@ void get_intra_block_B15( transrate_t *tr, RunLevel *blk )
             if (i < 64) goto normal_code;
         }
         fprintf(stderr, "Err in B15\n");
-       tr->b_error = 1;
+    tr->b_error = 1;
         break;  /* illegal, check needed to avoid buffer overflow */
     }
     bs_flush( bs, 4 );    /* dump end of block code */
@@ -718,7 +720,7 @@ int get_non_intra_block( transrate_t *tr, RunLevel *blk )
             if (i < 64) goto normal_code;
         }
         fprintf(stderr, "Err in non-intra\n");
-       tr->b_error = 1;
+    tr->b_error = 1;
         break;  /* illegal, check needed to avoid buffer overflow */
     }
     bs_flush( bs, 2 );    /* dump end of block code */