Contribs: update live555 patch

[vlc] / modules / mux / avi.c

diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index da6556ddb6f3eae61faa17680a116cbed241a552..0d2c4b6f4b3fbe80ad78780f55ac0f4aa5c12746 100644 (file)
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -211,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,
@@ -482,8 +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( p_sys->idx1.entry,
-                                             p_sys->idx1.i_entry_max * sizeof( avi_idx1_entry_t ) );
+                p_sys->idx1.entry = xrealloc( p_sys->idx1.entry,
+                       p_sys->idx1.i_entry_max * sizeof( avi_idx1_entry_t ) );
             }
 
             p_data = block_Realloc( p_data, 8, p_data->i_buffer );