Changeset 101d58fdc449a6ed7b1924b9c83881f762263a30

Timestamp:

19/01/08 20:58:45 (9 months ago)

Author:

Pavlov Konstantin <thresh@videolan.org>

git-committer:

Pavlov Konstantin <thresh@videolan.org> 1200772725 +0000

git-parent:

[42ca90b53c010df7346bab61975e52de30184223]

git-author:

Pavlov Konstantin <thresh@videolan.org> 1200772725 +0000

Message:

Move appropriate code to DEMUX_GET_LENGTH and destroy saved args when done.

Files:

• modules/demux/mpeg/mpga.c (modified) (4 diffs)

modules/demux/mpeg/mpga.c

@@ -339 +339 @@
-
-    va_copy ( args_save, args );
-    va_end ( args_save );
-
-    switch( i_query )
@@ -357 +356 @@
-             * needed for multi-input */
-
-default
+case DEMUX_GET_LENGTH
-            i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
-                                            p_sys->i_bitrate_avg, 1, i_query,
@@ -363 +362 @@
-            /* No bitrate, we can't have it precisely, but we can compute
-             * a raw approximation with time/position */
-i_query == DEMUX_GET_LENGTH &&
+
-            {
-                float f_pos = (double)(uint64_t)( stream_Tell( p_demux->s ) ) /
@@ -377 +376 @@
-                return VLC_SUCCESS;
-            }
+            va_end( args_save );
+            return i_ret;
+
+        default:
+            i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+                                            p_sys->i_bitrate_avg, 1, i_query,
+                                            args );
-            if( !i_ret && p_sys->i_bitrate_avg > 0 &&
-                (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME) )