Changeset 09b70e1c19e9ffce31146c4853cf705591e30adc

Timestamp:

06/11/06 22:52:08 (2 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[b7ce1c36e2c9fbfa4c452af991eb3aa8506755fe]

git-author:

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

Message:

* modules/packetizer/mpeg4video.c: ts/ps muxers rely on VOL being present in the stream.

Files:

• modules/packetizer/mpeg4video.c (modified) (2 diffs)

modules/packetizer/mpeg4video.c

@@ -337 +337 @@
-    if( p_frag->p_buffer[3] == 0xB0 || p_frag->p_buffer[3] == 0xB1 )
-    {
+#if 0
-        /* Remove VOS start/end code from the original stream */
-        block_Release( p_frag );
+#else
+        /* Append the block for now since ts/ps muxers rely on VOL
+         * being present in the stream */
+        block_ChainLastAppend( &p_sys->pp_last, p_frag );
+#endif
-        return NULL;
-    }
@@ -344 +350 @@
-    {
-        /* Copy the complete VOL */
-
-
-
+
+
+
+
+
+
-        memcpy( p_dec->fmt_out.p_extra, p_frag->p_buffer, p_frag->i_buffer );
-        ParseVOL( p_dec, &p_dec->fmt_out,
-                  p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
-
+#if 0
-        /* Remove from the original stream */
-        block_Release( p_frag );
+#else
+        /* Append the block for now since ts/ps muxers rely on VOL
+         * being present in the stream */
+        block_ChainLastAppend( &p_sys->pp_last, p_frag );
+#endif
-        return NULL;
-    }