]> git.sesse.net Git - vlc/commitdiff
avi: Fix seek bar position when streaming through network (fixes #2151)
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 21 Aug 2012 17:48:37 +0000 (17:48 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 7 Feb 2013 17:30:36 +0000 (18:30 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/demux/avi/avi.c

index 579891d8b41b77a00a760a7c32a88c8b4f387f48..7f5dea3cc76b203290810dce2f309c8d95d8e5ae 100644 (file)
@@ -1405,25 +1405,8 @@ static double ControlGetPosition( demux_t *p_demux )
     }
     else if( stream_Size( p_demux->s ) > 0 )
     {
-        unsigned int i;
-        int64_t i_tmp;
-        int64_t i64 = 0;
-
-        /* search the more advanced selected es */
-        for( i = 0; i < p_sys->i_track; i++ )
-        {
-            avi_track_t *tk = p_sys->track[i];
-            if( tk->b_activated && tk->i_idxposc < tk->idx.i_size )
-            {
-                i_tmp = tk->idx.p_entry[tk->i_idxposc].i_pos +
-                        tk->idx.p_entry[tk->i_idxposc].i_length + 8;
-                if( i_tmp > i64 )
-                {
-                    i64 = i_tmp;
-                }
-            }
-        }
-        return (double)i64 / stream_Size( p_demux->s );
+        double i64 = (uint64_t)stream_Tell( p_demux->s );
+        return i64 / stream_Size( p_demux->s );
     }
     return 0.0;
 }