Changeset 455c49fbd5f5b92f5c9bbc279c967ac713361b7a

Timestamp:

17/05/05 15:49:31 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1116337771 +0000

git-parent:

[fb751f6e275e31a69d81502d030a3fbaf5514831]

git-author:

Gildas Bazin <gbazin@videolan.org> 1116337771 +0000

Message:

* modules/mux/mpeg/ts.c: fixed FixPES().

Files:

• modules/mux/mpeg/ts.c (modified) (3 diffs)

modules/mux/mpeg/ts.c

@@ -181 +181 @@
- *****************************************************************************/
-static const char *ppsz_sout_options[] = {
- "es-id-pid",
-shaping", "pcr", "bmin", "bmax", "use-key-frames", "dts-delay
-
+
+es-id-pid", "shaping", "pcr", "bmin", "bmax", "use-key-frames
+dts-delay", "
-    NULL
-};
@@ -1345 +1345 @@
-    {
-        block_t *p_next;
+        int i_copy;
+
-        p_data = block_FifoGet( p_fifo );
-        p_data = block_Realloc( p_data, 0, STD_PES_PAYLOAD );
@@ -1354 +1356 @@
-            p_data->i_dts = p_next->i_dts;
-        }
+        i_copy = __MIN( STD_PES_PAYLOAD - i_size, p_next->i_buffer );
+
-        p_mux->p_vlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer,
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        p_next->i_flags |= BLOCK_FLAG_NO_KEYFRAME;
+
+        if( !p_next->i_buffer )
+        {
+            p_next = block_FifoGet( p_fifo );
+            block_Release( p_next );
+        }
-        return p_data;
-    }