Commit 2bc45f5c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

input "time" is a time variable, fix assertion failure

(cherry picked from commit fb3b3f25)

Conflicts:

	src/text/strings.c
parent eea83cd4
...@@ -825,7 +825,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -825,7 +825,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
if( p_item && p_input ) if( p_item && p_input )
{ {
mtime_t i_duration = input_item_GetDuration( p_item ); mtime_t i_duration = input_item_GetDuration( p_item );
int64_t i_time = var_GetInteger( p_input, "time" ); int64_t i_time = var_GetTime( p_input, "time" );
sprintf( buf, "%02d:%02d:%02d", sprintf( buf, "%02d:%02d:%02d",
(int)( ( i_duration - i_time ) / 3600000000 ), (int)( ( i_duration - i_time ) / 3600000000 ),
(int)( ( ( i_duration - i_time ) / 60000000 ) % 60 ), (int)( ( ( i_duration - i_time ) / 60000000 ) % 60 ),
...@@ -893,7 +893,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -893,7 +893,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
case 'T': case 'T':
if( p_input ) if( p_input )
{ {
int64_t i_time = var_GetInteger( p_input, "time" ); int64_t i_time = var_GetTime( p_input, "time" );
sprintf( buf, "%02d:%02d:%02d", sprintf( buf, "%02d:%02d:%02d",
(int)( i_time / ( 3600000000 ) ), (int)( i_time / ( 3600000000 ) ),
(int)( ( i_time / ( 60000000 ) ) % 60 ), (int)( ( i_time / ( 60000000 ) ) % 60 ),
......
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