Commit f9cebacf authored by Laurent Aimar's avatar Laurent Aimar
Browse files

* all: warning fixes.

 * mpjpeg.c: use sout_CfgParse !
parent 21a37621
......@@ -553,8 +553,8 @@ static int ReadDir( playlist_t *p_playlist,
}
#endif /* HAVE_STRSEP */
p_item = playlist_ItemNewWithType( p_playlist, psz_uri,
p_dir_content->d_name, ITEM_TYPE_VFILE );
p_item = playlist_ItemNewWithType( VLC_OBJECT(p_playlist),
psz_uri, p_dir_content->d_name, ITEM_TYPE_VFILE );
playlist_NodeAddItem( p_playlist,p_item,
p_parent->pp_parents[0]->i_view,
p_parent,
......
......@@ -137,7 +137,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
float *p_in_orig, *p_in, *p_out = (float *)p_out_buf->p_buffer;
float *p_in, *p_out = (float *)p_out_buf->p_buffer;
float *p_prev_sample = (float *)p_sys->p_prev_sample;
int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
......
......@@ -84,7 +84,7 @@ static int Create( vlc_object_t *p_this )
static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
int32_t *p_in_orig, *p_in, *p_out = (int32_t*)p_out_buf->p_buffer;
int32_t *p_in, *p_out = (int32_t*)p_out_buf->p_buffer;
unsigned int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
unsigned int i_in_nb = p_in_buf->i_nb_samples;
......
......@@ -40,6 +40,7 @@
#include "vlc_httpd.h"
#include "vlc_vlm.h"
#include "vlc_tls.h"
#include "charset.h"
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
......
......@@ -84,11 +84,12 @@ static int Open( vlc_object_t *p_this )
char *psz_separator_block, *psz_separator;
msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
p_sys = p_mux->p_sys = malloc( sizeof(sout_mux_sys_t) );
p_sys->b_send_headers = VLC_TRUE;
psz_separator = var_CreateGetString( p_mux, SOUT_CFG_PREFIX "separator" );
psz_separator = var_GetString( p_mux, SOUT_CFG_PREFIX "separator" );
i_size = strlen( psz_separator ) + 2 + 2 + 2 + strlen( CONTENT_TYPE );
psz_separator_block = (char*)malloc( i_size );
sprintf( psz_separator_block, "\r\n%s\r\n%s\r\n", psz_separator,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment