Qt sprefs, cleaning of Audio and Interface parts

[vlc] / modules / mux / avi.c

diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index 31e6504998ecf84deef4e6c58cca705b2d31729a..0d2c4b6f4b3fbe80ad78780f55ac0f4aa5c12746 100644 (file)
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -31,14 +31,11 @@
 # include "config.h"
 #endif
 
-#include <assert.h>
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 #include <vlc_codecs.h>
-#include <vlc_memory.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -214,7 +211,7 @@ static void Close( vlc_object_t * p_this )
                     (uint64_t)p_stream->i_duration;
         }
         msg_Info( p_mux, "stream[%d] duration:%"PRId64" totalsize:%"PRId64
-                  " frames:%d fps:%f kb/s:%d",
+                  " frames:%d fps:%f KiB/s:%d",
                   i_stream,
                   (int64_t)p_stream->i_duration / (int64_t)1000000,
                   p_stream->i_totalsize,
@@ -485,9 +482,8 @@ static int Mux      ( sout_mux_t *p_mux )
             if( p_sys->idx1.i_entry_count >= p_sys->idx1.i_entry_max )
             {
                 p_sys->idx1.i_entry_max += 10000;
-                p_sys->idx1.entry = realloc_or_free( p_sys->idx1.entry,
+                p_sys->idx1.entry = xrealloc( p_sys->idx1.entry,
                        p_sys->idx1.i_entry_max * sizeof( avi_idx1_entry_t ) );
-                assert( p_sys->idx1.entry );
             }
 
             p_data = block_Realloc( p_data, 8, p_data->i_buffer );