* mkv: ues es_format_t.

[vlc] / modules / packetizer / copy.c

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index 8ca80568cc91877886454532fcfcd5b8febaaa51..9b74eebd408942405e6a4ba29c52c5c3d3729fce 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -2,7 +2,7 @@
  * copy.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: copy.c,v 1.13 2003/08/08 16:50:27 gbazin Exp $
+ * $Id: copy.c,v 1.17 2003/09/29 22:37:36 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -80,9 +80,9 @@ static void input_ShowPES( decoder_fifo_t *p_fifo, pes_packet_t **pp_pes );
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
-    decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
+    decoder_t *p_dec = (decoder_t*)p_this;
 
-    p_fifo->pf_run = Run;
+    p_dec->pf_run = Run;
 
     return VLC_SUCCESS;
 }
@@ -386,6 +386,12 @@ static int Init( packetizer_thread_t *p_pack )
             p_pack->output_format.i_cat = SPU_ES;
             p_pack->pf_packetize = PacketizeSPU;
             break;
+
+        case VLC_FOURCC( 's', 'u', 'b', 't' ):
+            p_pack->output_format.i_fourcc = VLC_FOURCC( 's', 'u', 'b', 't' );
+            p_pack->output_format.i_cat = SPU_ES;
+            break;
+
         default:
             msg_Err( p_pack->p_fifo, "unknown es type !!" );
             return VLC_EGENERIC;
@@ -493,11 +499,10 @@ static void PacketizeStd( packetizer_thread_t *p_pack )
         p_pack->p_fifo->b_error = 1;
         return;
     }
-
-    msg_Dbg( p_pack->p_fifo,
-             "pes size:%d dts=%lld pts=%lld",
+#if 0
+    msg_Dbg( p_pack->p_fifo, "pes size:%d dts="I64Fd" pts="I64Fd,
              p_pes->i_pes_size, p_pes->i_dts, p_pes->i_pts );
-
+#endif
 
     if( p_pes->i_pts <= 0 )
     {
@@ -543,10 +548,10 @@ static void PacketizeSPU( packetizer_thread_t *p_pack )
             p_pack->p_fifo->b_error = 1;
             return;
         }
-
-        msg_Dbg( p_pack->p_fifo,
-                 "pes size:%d dts=%lld pts=%lld",
+#if 0
+        msg_Dbg( p_pack->p_fifo, "pes size:%d dts="I64Fd" pts="I64Fd,
                  p_pes->i_pes_size, p_pes->i_dts, p_pes->i_pts );
+#endif
 
         if( p_out == NULL &&
             ( p_pes->i_pts <= 0 || p_pes->i_pes_size < 4 ) )
@@ -673,4 +678,3 @@ static void input_ShowPES( decoder_fifo_t *p_fifo, pes_packet_t **pp_pes )
     *pp_pes = p_fifo->p_first;
     vlc_mutex_unlock( &p_fifo->data_lock );
 }
-