[vlc-commits] livehttp: remove multiplication by 1

Tristan Matthews git at videolan.org
Sat Nov 29 14:43:59 CET 2014


vlc/vlc-2.2 | branch: master | Tristan Matthews <le.businessman at gmail.com> | Fri Jun 27 16:48:21 2014 -0400| [c006c5fca414b5c6040b20b4664a9e836c71e9a5] | committer: Ilkka Ollakka

livehttp: remove multiplication by 1

(cherry picked from commit 8f311799715c843c420cfa4e0cee87310a20ef27)
Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

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

 modules/access_output/livehttp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index b34369b..a7f6d4d 100644
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -762,8 +762,8 @@ static void Close( vlc_object_t * p_this )
 
         /* Since we are flushing, check the segment change by hand and don't wait
          * possible keyframe*/
-        if( ((float)(output_block->i_length * CLOCK_FREQ / INT64_C(1000000) ) +
-            (float)(output_block->i_dts - p_sys->i_opendts)) >= p_sys->i_seglenm )
+        if( ((float) output_block->i_length +
+             (float) (output_block->i_dts - p_sys->i_opendts)) >= p_sys->i_seglenm )
         {
             closeCurrentSegment( p_access, p_sys, false );
             if( unlikely(openNextFile( p_access, p_sys ) < 0 ) )



More information about the vlc-commits mailing list