/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static char *ppsz_devices[] = { "default" };
-static char *ppsz_devices_text[] = { N_("Default") };
+static const char *ppsz_devices[] = { "default" };
+static const char *ppsz_devices_text[] = { N_("Default") };
vlc_module_begin();
set_shortname( "ALSA" );
set_description( _("ALSA audio output") );
/* Keep the first entrie */
for( i = 1; i < p_item->i_list; i++ )
{
- free( p_item->ppsz_list[i] );
- free( p_item->ppsz_list_text[i] );
+ free( (char *)p_item->ppsz_list[i] );
+ free( (char *)p_item->ppsz_list_text[i] );
}
/* TODO: Remove when no more needed */
p_item->ppsz_list[i] = NULL;
snd_pcm_info_get_name(p_pcm_info), psz_device );
p_item->ppsz_list =
- (char **)realloc( p_item->ppsz_list,
+ (const char **)realloc( p_item->ppsz_list,
(p_item->i_list + 2) * sizeof(char *) );
p_item->ppsz_list_text =
- (char **)realloc( p_item->ppsz_list_text,
+ (const char **)realloc( p_item->ppsz_list_text,
(p_item->i_list + 2) * sizeof(char *) );
p_item->ppsz_list[ p_item->i_list ] = psz_device;
p_item->ppsz_list_text[ p_item->i_list ] = psz_descr;
p_bridge = GetBridge( p_stream );
if ( p_bridge == NULL )
{
- vlc_object_t *p_libvlc = p_stream->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
vlc_value_t val;
p_bridge = malloc( sizeof( bridge_t ) );
if( b_no_es )
{
- vlc_object_t *p_libvlc = p_stream->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
for ( i = 0; i < p_bridge->i_es_num; i++ )
free( p_bridge->pp_es[i] );
free( p_bridge->pp_es );
{
sout_stream_t *p_stream = (sout_stream_t *)p_this;
sout_stream_sys_t *p_sys;
- vlc_object_t *p_libvlc = p_this->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_this->p_libvlc );
vlc_value_t val;
config_ChainParse( p_stream, CFG_PREFIX, ppsz_sout_options,
p_bridge = GetBridge( p_stream );
if ( p_bridge == NULL )
{
- vlc_object_t *p_libvlc = p_stream->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
vlc_value_t val;
p_bridge = malloc( sizeof( bridge_t ) );
if ( b_last_es )
{
- vlc_object_t *p_libvlc = p_stream->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
for ( i = 0; i < p_bridge->i_es_num; i++ )
free( p_bridge->pp_es[i] );
free( p_bridge->pp_es );
#define HURRYUP_LONGTEXT N_( "The transcoder will drop frames if your CPU " \
"can't keep up with the encoding rate." )
-static char *ppsz_deinterlace_type[] =
+static const char *ppsz_deinterlace_type[] =
{
"deinterlace", "ffmpeg-deinterlace"
};
#define TRANS_BITS 8
if( (i_pix_pitch == 4)
- && (((((int)p_dst)|((int)p_src1)|i_dst_pitch|i_src1_pitch) & 3) == 0) )
+ && (((((intptr_t)p_dst)|((intptr_t)p_src1)|i_dst_pitch|i_src1_pitch)
+ & 3) == 0) )
{
/*
- ** if picture pixels are 32 bits long and lines addresses are 32 bit aligned,
- ** optimize rendering
+ ** if picture pixels are 32 bits long and lines addresses are 32 bit
+ ** aligned, optimize rendering
*/
uint32_t *p32_dst = (uint32_t *)p_dst;
uint32_t i32_dst_pitch = (uint32_t)(i_dst_pitch>>2);
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <math.h>
-
#include <vlc/vlc.h>
#include <vlc_vout.h>
+#include <math.h>
+
#ifdef HAVE_LIMITS_H
# include <limits.h> /* INT_MAX */
#endif
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
- vlc_object_t *p_libvlc = p_filter->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_filter->p_libvlc );
char *psz_order;
char *psz_offsets;
int i_index;
#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
static bridge_t *__GetBridge( vlc_object_t *p_object )
{
- vlc_object_t *p_libvlc = p_object->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_object->p_libvlc );
bridge_t *p_bridge;
vlc_value_t val;