# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_codecs.h>
vlc_module_begin();
set_shortname( "MJPEG");
- set_description( _("M-JPEG camera demuxer") );
- set_capability( "demux2", 5 );
+ set_description( N_("M-JPEG camera demuxer") );
+ set_capability( "demux", 5 );
set_callbacks( Open, Close );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
i--;
}
p_line = malloc( i + 1 );
- if( NULL == p_line )
- {
- msg_Err( p_demux, "out of memory" );
+ if( p_line == NULL )
return NULL;
- }
strncpy ( p_line, (char*)p_buf, i );
p_line[i] = '\0';
// msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line );
/* Check for jpeg file extension */
p_sys->b_still = false;
p_sys->i_still_end = 0;
- if( demux2_IsPathExtension( p_demux, ".jpeg" ) ||
- demux2_IsPathExtension( p_demux, ".jpg" ) )
+ if( demux_IsPathExtension( p_demux, ".jpeg" ) ||
+ demux_IsPathExtension( p_demux, ".jpg" ) )
{
p_sys->b_still = true;
if( val.f_float)
{
- p_sys->i_still_length =1000000.0 / val.f_float;
+ p_sys->i_still_length = 1000000.0 / val.f_float;
}
else
{
{
demux_sys_t *p_sys = p_demux->p_sys;
int i_size, i;
- bool b_match;
- bool b_done;
- b_match = CheckMimeHeader( p_demux, &i_size );
+ bool b_match = CheckMimeHeader( p_demux, &i_size );
+
if( i_size > 0 )
{
stream_Read( p_demux->s, NULL, i_size );
msg_Warn( p_demux, "cannot peek data" );
return 0;
}
+
i = 0;
i_size = strlen( p_sys->psz_separator ) + 2;
if( p_sys->i_data_peeked < i_size )
msg_Warn( p_demux, "data shortage" );
return 0;
}
- b_done = false;
- while( !b_done )
+
+ for( ;; )
{
while( !( p_sys->p_peek[i] == '-' && p_sys->p_peek[i+1] == '-' ) )
{
}
}
}
+
if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2),
strlen( p_sys->psz_separator ) ) )
{
- b_done = true;
- }
- else
- {
- i++;
- i_size++;
+ break;
}
+
+ i++;
+ i_size++;
}
if( !b_match )
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
- return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 0, i_query, args );
+ return demux_vaControlHelper( p_demux->s, 0, 0, 0, 0, i_query, args );
}