X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmash.cpp;h=86245790fae8a825ba15199775934d749bf7841e;hb=314cd3825c7b20f77bab5fcc9909a7e700d88d3f;hp=c5dce5bfe35fb08226108e8085e09dddef81b735;hpb=14f37b2101842fa6e427f962f689db74eff6faba;p=vlc

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index c5dce5bfe3..86245790fa 100644
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -97,7 +97,7 @@ static int OpenDecoder( vlc_object_t *p_this )
           (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
         return VLC_ENOMEM;
     /* Misc init */
-    p_sys->i_pts = 0;
+    p_sys->i_pts = VLC_TS_INVALID;
     p_sys->b_inited = false;
     p_sys->i_counter = 0;
 
@@ -143,7 +143,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     p_block = *pp_block;
 
-    if( !p_sys->i_pts && !p_block->i_pts && !p_block->i_dts )
+    if( p_sys->i_pts <= VLC_TS_INVALID && p_block->i_pts <= VLC_TS_INVALID &&
+        p_block->i_dts <= VLC_TS_INVALID )
     {
         /* We've just started the stream, wait for the first PTS. */
         block_Release( p_block );
@@ -152,11 +153,10 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
 
     /* Date management */
-    if( p_block->i_pts > 0 || p_block->i_dts > 0 )
-    {
-        if( p_block->i_pts > 0 ) p_sys->i_pts = p_block->i_pts;
-        else if( p_block->i_dts > 0 ) p_sys->i_pts = p_block->i_dts;
-    }
+    if( p_block->i_pts > VLC_TS_INVALID )
+        p_sys->i_pts = p_block->i_pts;
+    else if( p_block->i_dts > VLC_TS_INVALID )
+        p_sys->i_pts = p_block->i_dts;
 
     i_video_header = *(uint32_t*)p_block->p_buffer; /* yes, it is native endian */
     sbit = i_video_header >> 29; /* start bit position */
@@ -173,7 +173,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     mvdv = i_video_header & 0x1f; /* vertical motion vector data */
     cc = p_block->i_buffer - 4;
     msg_Dbg( p_dec, "packet size %d", cc );
- 
+
     /* Find out p_vdec->i_raw_size */
     p_sys->p_decoder->decode( p_block->p_buffer + 4 /*bp?*/,
                               cc /*cc?*/,
@@ -192,7 +192,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                   i_height);
         video_format_Setup( &p_dec->fmt_out.video, VLC_CODEC_I420,
                             i_width, i_height,
-                            VOUT_ASPECT_FACTOR * i_width / i_height );
+                            1, 1 );
         p_sys->b_inited = true;
     }
     p_pic = NULL;