Cosmetics (use PES_EXTENDED_STREAM_ID)

[vlc] / modules / mux / mpjpeg.c

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index a63d488216dc40a3132253e5097d8d0ca6deac5d..1511373046365afbf98d7e8e9c8a82055706cc28 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
@@ -42,16 +42,16 @@ static void Close  ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 
-vlc_module_begin();
-    set_shortname( "MPJPEG" );
-    set_description( N_("Multipart JPEG muxer") );
-    set_capability( "sout mux", 5 );
-    add_obsolete_string( SOUT_CFG_PREFIX "separator" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_callbacks( Open, Close );
-    add_shortcut( "mpjpeg" );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "MPJPEG" )
+    set_description( N_("Multipart JPEG muxer") )
+    set_capability( "sout mux", 5 )
+    add_obsolete_string( SOUT_CFG_PREFIX "separator" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_callbacks( Open, Close )
+    add_shortcut( "mpjpeg" )
+vlc_module_end ()
 
 /*****************************************************************************
  * Exported prototypes
@@ -165,7 +165,7 @@ static int Mux( sout_mux_t *p_mux )
         static const char psz_hfmt[] = "\r\n"
             "--"BOUNDARY"\r\n"
             "Content-Type: image/jpeg\r\n"
-            "Content-Length: %u\r\n"
+            "Content-Length: %zu\r\n"
             "\r\n";
         block_t *p_data = block_FifoGet( p_fifo );
         block_t *p_header = block_New( p_mux, sizeof( psz_hfmt ) + 20 );