Qt4 - pixmaps again. Removing bigger images, useless ones, and cleaning.

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 57fde2e2451ae38b70190c00b6a167738850116d..7e50a49e70de1a51aab7ef8f36091d689b4116b4 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
@@ -99,7 +98,7 @@ static int OpenCommon( vlc_object_t *p_this, vlc_bool_t b_force )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
 
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
     {
@@ -260,7 +259,7 @@ static void FindLength( demux_t *p_demux )
                 {
                     p_sys->i_length = i_length;
                     p_sys->i_time_track = i;
-                    msg_Dbg( p_demux, "we found a length of: %lld", p_sys->i_length );
+                    msg_Dbg( p_demux, "we found a length of: "I64Fd, p_sys->i_length );
                 }
             }
     }
@@ -383,7 +382,7 @@ static int Demux( demux_t *p_demux )
                 if( !b_new && !p_sys->b_have_pack && tk->fmt.i_cat == AUDIO_ES && p_pkt->i_pts > 0 )
                 {
                     /* A hack to sync the A/V on PES files. */
-                    msg_Dbg( p_demux, "force SCR: %lld", p_pkt->i_pts );
+                    msg_Dbg( p_demux, "force SCR: "I64Fd, p_pkt->i_pts );
                     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts );
                 }
 
@@ -503,7 +502,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
  */
 static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int     i_peek;
     int     i_skip;
 
@@ -546,7 +545,7 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
 
 static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int      i_peek = stream_Peek( s, &p_peek, 14 );
     int      i_size = ps_pkt_size( p_peek, i_peek );