X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpjpeg.c;h=1de2ec4cbe4774a494931613af5b5a17c00da41c;hb=8cf7b429d7e60a1ddb6b38fc0be8b0e13df52d9c;hp=1cac1b5098184426e4325c44c76454c6fb5885e9;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index 1cac1b5098..1de2ec4cbe 100644
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -29,10 +29,10 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
-#include <vlc_codecs.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -42,16 +42,16 @@ static void Close  ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 
-vlc_module_begin();
-    set_shortname( "MPJPEG" );
-    set_description( _("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
@@ -131,16 +131,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     }
 
     msg_Dbg( p_mux, "adding input" );
-    if( p_input->p_fmt->i_codec != VLC_FOURCC('M','J','P','G') &&
-        p_input->p_fmt->i_codec != VLC_FOURCC('m','j','p','g') &&
-        p_input->p_fmt->i_codec != VLC_FOURCC('j','p','e','g') &&
-        p_input->p_fmt->i_codec != VLC_FOURCC('J','P','E','G') &&
-        p_input->p_fmt->i_codec != VLC_FOURCC('J','F','I','F') &&
-        p_input->p_fmt->i_codec != VLC_FOURCC('J','P','G','L') &&
-        p_input->p_fmt->i_codec != VLC_FOURCC('m','j','p','a') )
-    {
+    if( p_input->p_fmt->i_codec != VLC_CODEC_MJPG )
         return VLC_EGENERIC;
-    }
 
     return VLC_SUCCESS;
 }
@@ -165,7 +157,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 );