# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_meta.h>
#include <vlc_input.h>
static void Close ( vlc_object_t * );
vlc_module_begin();
- set_description( _("FLAC demuxer") );
+ set_description( N_("FLAC demuxer") );
set_capability( "demux", 155 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- const byte_t *p_peek;
+ const uint8_t *p_peek;
uint8_t *p_streaminfo;
int i_streaminfo;
(p_sys->seekpoint[i+1]->i_time_offset-p_sys->seekpoint[i]->i_time_offset);
/* XXX We do exact seek if it's not too far away(45s) */
- if( i_delta_time < 45*I64C(1000000) )
+ if( i_delta_time < 45*INT64_C(1000000) )
{
if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos ) )
return VLC_EGENERIC;
/* */
ParseStreamInfo( p_demux, &i_sample_rate, &i_sample_count, *pp_streaminfo, *pi_streaminfo );
if( i_sample_rate > 0 )
- p_sys->i_length = i_sample_count * I64C(1000000)/i_sample_rate;
+ p_sys->i_length = i_sample_count * INT64_C(1000000)/i_sample_rate;
/* Be sure we have seekpoint 0 */
s = vlc_seekpoint_New();
const int i_skip = 4+4;
*pi_rate = GetDWBE(&p_data[i_skip+4+6]) >> 12;
- *pi_count = GetQWBE(&p_data[i_skip+4+6]) & ((I64C(1)<<36)-1);
+ *pi_count = GetQWBE(&p_data[i_skip+4+6]) & ((INT64_C(1)<<36)-1);
}
static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
continue;
s = vlc_seekpoint_New();
- s->i_time_offset = i_sample * I64C(1000000)/i_sample_rate;
+ s->i_time_offset = i_sample * INT64_C(1000000)/i_sample_rate;
s->i_byte_offset = GetQWBE( &p_data[4+18*i+8] );
/* Check for duplicate entry */
if( oldval ) \
{ \
char * newval; \
- asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ); \
+ if( asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ) == -1 ) \
+ newval = NULL; \
vlc_meta_Set( p_sys->p_meta, vlc_meta_ ## var, newval ); \
free( newval ); \
} \
i_type = GetDWBE( p_data ); RM(4);
i_len = GetDWBE( p_data ); RM(4);
- if( i_data < i_len + 4 )
+ if( i_len < 0 || i_data < i_len + 4 )
goto error;
psz_mime = strndup( p_data, i_len ); RM(i_len);
i_len = GetDWBE( p_data ); RM(4);
- if( i_data < i_len + 4*4 + 4)
+ if( i_len < 0 || i_data < i_len + 4*4 + 4)
goto error;
psz_description = strndup( p_data, i_len ); RM(i_len);
EnsureUTF8( psz_description );
RM(4*4);
i_len = GetDWBE( p_data ); RM(4);
- if( i_len > i_data )
+ if( i_len < 0 || i_len > i_data )
goto error;
msg_Dbg( p_demux, "FLAC: Picture type=%d mime=%s description='%s' file length=%d",