[vlc-devel] commit: input "time" is a time variable, fix assertion failure ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Jul 12 18:33:52 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 12 19:32:11 2009 +0300| [2bc45f5c0c3aeae8dfb74d00ee7fd4860b3c7104] | committer: Rémi Denis-Courmont 

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

(cherry picked from commit fb3b3f25fc0ea9a8f5046aa45682b6c2f43d0391)

Conflicts:

	src/text/strings.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2bc45f5c0c3aeae8dfb74d00ee7fd4860b3c7104
---

 src/text/strings.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/text/strings.c b/src/text/strings.c
index 736bb87..e61d699 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -825,7 +825,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     if( p_item && p_input )
                     {
                         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",
                      (int)( ( i_duration - i_time ) / 3600000000 ),
                      (int)( ( ( i_duration - i_time ) / 60000000 ) % 60 ),
@@ -893,7 +893,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                 case 'T':
                     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",
                             (int)( i_time / ( 3600000000 ) ),
                             (int)( ( i_time / ( 60000000 ) ) % 60 ),




More information about the vlc-devel mailing list