# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#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
}
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;
}
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 );