* modules/demux/real.c, modules/codec/ffmpeg/demux.c: removed debug I left in there.

[vlc] / modules / codec / ffmpeg / demux.c

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index 8fd03644b5411acb01743ff01be9710d9f1bfb58..bb71b93c2c8101b572a1cc2708767603014c911a 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -74,7 +74,7 @@ static int Demux  ( demux_t *p_demux );
 static int Control( demux_t *p_demux, int i_query, va_list args );
 
 static int IORead( void *opaque, uint8_t *buf, int buf_size );
-static int IOSeek( void *opaque, offset_t offset, int whence );
+static offset_t IOSeek( void *opaque, offset_t offset, int whence );
 
 /*****************************************************************************
  * Open
@@ -256,6 +256,7 @@ void E_(CloseDemux)( vlc_object_t *p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
+    FREENULL( p_sys->tk );
     if( p_sys->ic ) av_close_input_file( p_sys->ic );
     if( p_sys->io_buffer ) free( p_sys->io_buffer );
     free( p_sys );
@@ -338,7 +339,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
             }
 
-            if( p_sys->ic->duration != AV_NOPTS_VALUE && p_sys->i_pcr > 0 )
+            if( (p_sys->ic->duration != AV_NOPTS_VALUE) && (p_sys->i_pcr > 0) )
             {
                 *pf = (double)p_sys->i_pcr / (double)p_sys->ic->duration;
             }
@@ -413,7 +414,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             if( p_sys->ic->title[0] )
                 vlc_meta_SetTitle( p_meta, p_sys->ic->title );
             if( p_sys->ic->author[0] )
-                vlc_meta_SetAuthor( p_meta, p_sys->ic->author );
+                vlc_meta_SetArtist( p_meta, p_sys->ic->author );
             if( p_sys->ic->copyright[0] )
                 vlc_meta_SetCopyright( p_meta, p_sys->ic->copyright );
             if( p_sys->ic->comment[0] )
@@ -439,7 +440,7 @@ static int IORead( void *opaque, uint8_t *buf, int buf_size )
     return i_ret ? i_ret : -1;
 }
 
-static int IOSeek( void *opaque, offset_t offset, int whence )
+static offset_t IOSeek( void *opaque, offset_t offset, int whence )
 {
     URLContext *p_url = opaque;
     demux_t *p_demux = p_url->priv_data;