Skip to content

V
vlc-2-2
Commit 8a4ad005 authored by Sigmund Augdal Helberg's avatar Sigmund Augdal Helberg
Browse files
Options

modules/demux/mkv.cpp: 

 * proper fix for timing with vobsub tracks ( and possibly some other cases )
parent a77da791
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
modules/demux/mkv.cpp
View file @ 8a4ad005
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mkv.cpp : matroska demuxer * mkv.cpp : matroska demuxer
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: mkv.cpp,v 1.34 2003/11/02 16:12:27 sigmunau Exp $ * $Id: mkv.cpp,v 1.35 2003/11/02 18:03:45 sigmunau Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -1508,6 +1508,7 @@ static pes_packet_t *MemToPES( input_thread_t *p_input, uint8_t *p_mem, int i_me ...@@ -1508,6 +1508,7 @@ static pes_packet_t *MemToPES( input_thread_t *p_input, uint8_t *p_mem, int i_me
p_pes->p_first = p_pes->p_last = p_data; p_pes->p_first = p_pes->p_last = p_data;
p_pes->i_nb_data = 1; p_pes->i_nb_data = 1;
p_pes->i_pes_size = i_mem; p_pes->i_pes_size = i_mem;
p_pes->i_rate = p_input->stream.control.i_rate;
return p_pes; return p_pes;
} }
...@@ -1686,11 +1687,7 @@ static void BlockDecode( input_thread_t *p_input, KaxBlock *block, mtime_t i_pts ...@@ -1686,11 +1687,7 @@ static void BlockDecode( input_thread_t *p_input, KaxBlock *block, mtime_t i_pts
input_DecodePES( tk.p_es->p_decoder_fifo, p_pes ); input_DecodePES( tk.p_es->p_decoder_fifo, p_pes );
/* use time stamp only for first block */ /* use time stamp only for first block */
if( !strcmp( tk.psz_codec, "S_VOBSUB" ) ) i_pts = 0;
{
i_pts += 1000 * i_duration;
}
else i_pts = 0;
} }
#undef tk #undef tk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment