Changeset 6de833a425913c7f4fc6d0ef1b77dbd13f10526e

Timestamp:

02/11/04 21:52:45 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1099428765 +0000

git-parent:

[7216315d85b2395b7adfbe5fda75f9f83564266e]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1099428765 +0000

Message:

* fixed a problem with sub-fps overriding

If subtitle format doesn't have their own reference, they should define 25fps as the the standard reference, BUT NOT GLOBALLY. Cause then ALL subtitle formats will use this correction factor of 25fps.

Files:

• modules/demux/subtitle.c (modified) (3 diffs)

modules/demux/subtitle.c

@@ -191 +191 @@
-
-    /* Get the FPS */
-    p_sys->i_microsecperframe = 40000; /* default to 25 fps */
-    f_fps = var_CreateGetFloat( p_demux, "sub-fps" );
-    if( f_fps >= 1.0 )
-    {
-        p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps );
+    }
+    else
+    {
+        p_sys->i_microsecperframe = 0;
-    }
-
@@ -681 +684 @@
-    unsigned int i;
-
+    int i_microsecperframe = 40000; /* default to 25 fps */
+    if( p_sys->i_microsecperframe > 0 ) 
+        i_microsecperframe = p_sys->i_microsecperframe;
+    
-    p_subtitle->i_start = 0;
-    p_subtitle->i_stop  = 0;
@@ -710 +717 @@
-    }
-
-p_sys->
-p_sys->
+
+
-    p_subtitle->psz_text = strndup( buffer_text, MAX_LINE );
-    return( 0 );