diff options
| -rw-r--r-- | cfgparser.c | 1 | ||||
| -rw-r--r-- | loader/registry.c | 7 | ||||
| -rw-r--r-- | loader/win32.c | 1 | ||||
| -rw-r--r-- | nuppelvideo.c | 2 | ||||
| -rw-r--r-- | vobsub.h | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/cfgparser.c b/cfgparser.c index f4d3bf02c5..50a06deae4 100644 --- a/cfgparser.c +++ b/cfgparser.c @@ -59,6 +59,7 @@ m_config_save_option(m_config_t* config, config_t* conf,char* opt, char *param) case CONF_TYPE_SUBCONFIG : return; default : + ; } mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Saving option %s\n",opt); diff --git a/loader/registry.c b/loader/registry.c index 26fd768177..706b9d5d80 100644 --- a/loader/registry.c +++ b/loader/registry.c @@ -18,11 +18,12 @@ //#undef TRACE //#define TRACE printf -// ...can be set before init_registry() call -char* regpathname = 0; +extern char *get_path ( char * ); +// ...can be set before init_registry() call +char* regpathname = NULL; -static char* localregpathname = 0; +static char* localregpathname = NULL; typedef struct reg_handle_s { diff --git a/loader/win32.c b/loader/win32.c index 4fe172a8ed..eeb2114015 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -407,6 +407,7 @@ int my_release(void* memory) break; default: //memset(memory, 0xcc, header->size); + ; } header->deadbeef = 0; diff --git a/nuppelvideo.c b/nuppelvideo.c index 8ac1729477..98788dd6e9 100644 --- a/nuppelvideo.c +++ b/nuppelvideo.c @@ -77,7 +77,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, if ( lzo_init() != LZO_E_OK ) { fprintf ( stderr, "%s\n", "lzo_init() failed !!!" ); - return NULL; + return; } is_lzo_inited = 1; } @@ -6,4 +6,4 @@ extern void vobsub_process(void *vob, float pts); extern void vobsub_reset(void *vob); extern void vobsub_draw(void *vob, int dxs, int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); -#endif MPLAYER_VOBSUB_H +#endif /* MPLAYER_VOBSUB_H */ |