Commit f93eb575 authored by Rémi Duraffort's avatar Rémi Duraffort

Fix compiler warnings.

parent 63885438
...@@ -156,7 +156,7 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux ) ...@@ -156,7 +156,7 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux )
} }
if( !found ) if( !found )
{ {
msg_Err( p_demux, "Can't find camera with uid : 0x%llx.", msg_Err( p_demux, "Can't find camera with uid : 0x%"PRIx64".",
sys->selected_uid ); sys->selected_uid );
goto end; goto end;
} }
......
...@@ -1626,7 +1626,7 @@ static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk, ...@@ -1626,7 +1626,7 @@ static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk,
else else
{ {
/* Reset on broken stream */ /* Reset on broken stream */
msg_Err( p_demux, "Broken packet detected (%d vs %d or %d + %d vs %d)", msg_Err( p_demux, "Broken packet detected (%d vs %zu or %d + %d vs %d)",
i_offset, tk->p_asf_block->i_buffer, i_offset, i_payload, i_packet_size); i_offset, tk->p_asf_block->i_buffer, i_offset, i_payload, i_packet_size);
tk->p_asf_block->i_buffer = 0; tk->p_asf_block->i_buffer = 0;
} }
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
* - Remove static currentGroup * - Remove static currentGroup
*/ */
#define __STDC_FORMAT_MACROS 1
#define __STDC_CONSTANT_MACROS 1
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
...@@ -122,7 +125,7 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf, ...@@ -122,7 +125,7 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf,
bool bStatic = false ) bool bStatic = false )
{ {
QAction *action; QAction *action;
if( strlen( icon ) > 0 ) if( !EMPTY_STR( icon ) )
{ {
action = menu->addAction( text, THEMIM, member ); action = menu->addAction( text, THEMIM, member );
action->setIcon( QIcon( icon ) ); action->setIcon( QIcon( icon ) );
...@@ -1390,7 +1393,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, ...@@ -1390,7 +1393,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
case VLC_VAR_INTEGER: case VLC_VAR_INTEGER:
var_Get( p_object, psz_var, &val ); var_Get( p_object, psz_var, &val );
if( CURTEXT ) menutext = qfu( CURTEXT ); if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%d", CURVAL.i_int ); else menutext.sprintf( "%"PRId64, CURVAL.i_int );
CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO, CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
p_object, CURVAL, i_type, p_object, CURVAL, i_type,
( CURVAL.i_int == val.i_int ) ( CURVAL.i_int == val.i_int )
......
Markdown is supported
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