Commit 5f0dad56 authored by Sam Hocevar's avatar Sam Hocevar

* ./modules/codec/spudec/parse.c: fixed a wrapping issue in the subtitle date

    calculation in slow-mo.
parent c92a0496
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* parse.c: SPU parser * parse.c: SPU parser
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: parse.c,v 1.8 2003/01/09 10:12:42 sam Exp $ * $Id: parse.c,v 1.9 2003/01/17 13:54:11 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -271,7 +271,7 @@ static int ParseControlSeq( spudec_thread_t *p_spudec, ...@@ -271,7 +271,7 @@ static int ParseControlSeq( spudec_thread_t *p_spudec,
if( i_command == SPU_CMD_END ) if( i_command == SPU_CMD_END )
{ {
/* Get the control sequence date */ /* Get the control sequence date */
date = GetBits( &p_spudec->bit_stream, 16 ) * 11000 date = (mtime_t)GetBits( &p_spudec->bit_stream, 16 ) * 11000
* p_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE; * p_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE;
/* Next offset */ /* Next offset */
...@@ -415,8 +415,8 @@ static int ParseControlSeq( spudec_thread_t *p_spudec, ...@@ -415,8 +415,8 @@ static int ParseControlSeq( spudec_thread_t *p_spudec,
if( p_spu->i_stop <= p_spu->i_start && !p_spu->b_ephemer ) if( p_spu->i_stop <= p_spu->i_start && !p_spu->b_ephemer )
{ {
/* This subtitle will live for 5 seconds or until the next subtitle */ /* This subtitle will live for 5 seconds or until the next subtitle */
p_spu->i_stop = p_spu->i_start + 500 * 11000 p_spu->i_stop = p_spu->i_start + (mtime_t)500 * 11000
* p_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE;; * p_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE;
p_spu->b_ephemer = VLC_TRUE; p_spu->b_ephemer = VLC_TRUE;
} }
......
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