* Fixed make dist by updating POTFILES.in.

[vlc] / modules / demux / mkv.cpp

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index a86f299174a3f5a212657a9055058bbff6895d46..8d2ede2dfc554b2cd58b6fb3241218688b0651e0 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -1997,7 +1997,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts,
                 if ( f_mandatory )
                     p_block->i_dts = p_block->i_pts;
                 else
-                    p_block->i_dts = min( i_pts, tk->i_last_dts + (tk->i_default_duration >> 10));
+                    p_block->i_dts = min( i_pts, tk->i_last_dts + (mtime_t)(tk->i_default_duration >> 10));
                 p_sys->i_pts = p_block->i_dts;
             }
         }
@@ -4911,8 +4911,6 @@ void matroska_segment_c::ParseCluster( )
  *****************************************************************************/
 void matroska_segment_c::InformationCreate( )
 {
-    size_t      i_track;
-
     sys.meta = vlc_meta_New();
 
     if( psz_title )
@@ -4923,6 +4921,7 @@ void matroska_segment_c::InformationCreate( )
     {
         vlc_meta_SetDate( sys.meta, psz_date_utc );
     }
+#if 0
     if( psz_segment_filename )
     {
         fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" );
@@ -4936,12 +4935,13 @@ void matroska_segment_c::InformationCreate( )
         fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" );
     }
 
-    for( i_track = 0; i_track < tracks.size(); i_track++ )
+    for( size_t i_track = 0; i_track < tracks.size(); i_track++ )
     {
 //        mkv_track_t *tk = tracks[i_track];
 //        vlc_meta_t *mtk = vlc_meta_New();
         fprintf( stderr, "***** WARNING: Unhandled child meta\n");
     }
+#endif
 
     if( i_tags_position >= 0 )
     {
@@ -5264,18 +5264,23 @@ void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapt
 
 bool matroska_segment_c::CompareSegmentUIDs( const matroska_segment_c * p_item_a, const matroska_segment_c * p_item_b )
 {
+    EbmlBinary *p_tmp;
+
     if ( p_item_a == NULL || p_item_b == NULL )
         return false;
 
-    EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid);
-    if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
+    p_tmp = (EbmlBinary *)p_item_a->p_segment_uid;
+    if ( p_item_b->p_prev_segment_uid != NULL
+          && *p_tmp == *p_item_b->p_prev_segment_uid )
         return true;
 
-    p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid);
-    if ( p_item_b->p_segment_uid != NULL && *p_itema == *p_item_b->p_segment_uid )
+    p_tmp = (EbmlBinary *)p_item_a->p_next_segment_uid;
+    if ( p_item_b->p_segment_uid != NULL
+          && *p_tmp == *p_item_b->p_segment_uid )
         return true;
 
-    if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
+    if ( p_item_b->p_prev_segment_uid != NULL
+          && *p_tmp == *p_item_b->p_prev_segment_uid )
         return true;
 
     return false;