control/media_instance.c: Avoid multiple libvlc_MediaInstanceReachedEnd, by providing...

[vlc] / modules / demux / asf / libasf.c

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index e21d6b9a56b8cd1cf37d94f240c8303f369eed0d..8453b0f017332b1c3b19762b423bc0cd718d2f42 100644 (file)
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -22,9 +22,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
-#include <stdio.h>
 
 #include <vlc_demux.h>
 
@@ -131,6 +134,7 @@ static int ASF_NextObject( stream_t *s, asf_object_t *p_obj )
 
 static void ASF_FreeObject_Null( asf_object_t *pp_obj )
 {
+    VLC_UNUSED(pp_obj);
     return;
 }
 
@@ -267,7 +271,7 @@ static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj )
     int           i_peek;
     const uint8_t *p_peek;
 
-    if( ( i_peek = stream_Peek( s, &p_peek,  104) ) < 104 )
+    if( ( i_peek = stream_Peek( s, &p_peek,  104 ) ) < 104 )
     {
        return VLC_EGENERIC;
     }
@@ -275,9 +279,10 @@ static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj )
     p_fp->i_file_size = GetQWLE( p_peek + 40 );
     p_fp->i_creation_date = GetQWLE( p_peek + 48 );
     p_fp->i_data_packets_count = GetQWLE( p_peek + 56 );
-    p_fp->i_play_duration = GetQWLE( p_peek + 64 );
-    p_fp->i_send_duration = GetQWLE( p_peek + 72 );
-    p_fp->i_preroll = GetQWLE( p_peek + 80 );
+    p_fp->i_send_duration = GetQWLE( p_peek + 64 );
+    p_fp->i_play_duration = GetQWLE( p_peek + 72 );
+    p_fp->i_preroll = GetDWLE( p_peek + 80 );
+    p_fp->i_unknown = GetDWLE( p_peek + 84 );
     p_fp->i_flags = GetDWLE( p_peek + 88 );
     p_fp->i_min_data_packet_size = GetDWLE( p_peek + 92 );
     p_fp->i_max_data_packet_size = GetDWLE( p_peek + 96 );
@@ -287,13 +292,13 @@ static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj )
     msg_Dbg( s,
             "read \"file properties object\" file_id:" GUID_FMT
             " file_size:"I64Fd" creation_date:"I64Fd" data_packets_count:"
-            I64Fd" play_duration:"I64Fd" send_duration:"I64Fd" preroll:"
-            I64Fd" flags:%d min_data_packet_size:%d max_data_packet_size:%d "
-            "max_bitrate:%d",
+            I64Fd" send_duration:"I64Fd" play_duration:"I64Fd" preroll:%d"
+            "unknown:%d flags:%d min_data_packet_size:%d "
+            "max_data_packet_size:%d max_bitrate:%d",
             GUID_PRINT( p_fp->i_file_id ), p_fp->i_file_size,
             p_fp->i_creation_date, p_fp->i_data_packets_count,
-            p_fp->i_play_duration, p_fp->i_send_duration,
-            p_fp->i_preroll, p_fp->i_flags,
+            p_fp->i_send_duration, p_fp->i_play_duration,
+            p_fp->i_preroll, p_fp->i_unknown, p_fp->i_flags,
             p_fp->i_min_data_packet_size, p_fp->i_max_data_packet_size,
             p_fp->i_max_bitrate );
 #endif
@@ -816,10 +821,10 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
     }
 
 #ifdef ASF_DEBUG
-    msg_Dbg( s, "read \"language list object\" %d entries", 
+    msg_Dbg( s, "read \"language list object\" %d entries",
              p_ll->i_language );
     for( i = 0; i < p_ll->i_language; i++ )
-        msg_Dbg( s, "  - '%s'", 
+        msg_Dbg( s, "  - '%s'",
                  p_ll->ppsz_language[i] );
 #endif
     return VLC_SUCCESS;
@@ -867,7 +872,7 @@ static int ASF_ReadObject_stream_bitrate_properties( stream_t *s,
     {
         msg_Dbg( s,"  - stream=%d bitrate=%d",
                  p_sb->bitrate[i].i_stream_number,
-                 p_sb->bitrate[i].i_avg_bitrate ); 
+                 p_sb->bitrate[i].i_avg_bitrate );
     }
 #endif
     return VLC_SUCCESS;
@@ -946,7 +951,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
         asf_object_t *p_sp;
         /* Cannot fail as peek succeed */
         stream_Read( s, NULL, p_data - p_peek );
-        
+ 
         p_sp = malloc( sizeof( asf_object_t ) );
 
         if( ASF_ReadObject( s, p_sp, NULL ) )
@@ -1026,7 +1031,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
         p_ae->pi_stream_number[i] = GetWLE( p_data );
         p_data += 2;
     }
-        
+ 
 #ifdef ASF_DEBUG
     msg_Dbg( s, "read \"advanced mutual exclusion object\"" );
     for( i = 0; i < p_ae->i_stream_number_count; i++ )
@@ -1166,7 +1171,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s,
             p_ec->ppsz_value[i] = NULL;
 
         p_data += i_size;
-        
+ 
 
 
 #undef GETSTRINGW