diff options
| -rw-r--r-- | libaf/af_karaoke.c | 4 | ||||
| -rw-r--r-- | libmpdemux/network.h | 2 | ||||
| -rw-r--r-- | libvo/gl_common.c | 8 | ||||
| -rw-r--r-- | m_option.c | 4 | ||||
| -rw-r--r-- | m_struct.h | 2 | ||||
| -rw-r--r-- | subopt-helper.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/libaf/af_karaoke.c b/libaf/af_karaoke.c index 7a9270c378..22d6ced2a9 100644 --- a/libaf/af_karaoke.c +++ b/libaf/af_karaoke.c @@ -23,7 +23,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->data->rate = ((af_data_t*)arg)->rate; af->data->nch = ((af_data_t*)arg)->nch; af->data->format= AF_FORMAT_FLOAT_NE; - af->data->bps = 4; + af->data->bps = 8; return af_test_output(af,(af_data_t*)arg); } return AF_UNKNOWN; @@ -41,7 +41,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) { af_data_t* c = data; // Current working data float* a = c->audio; // Audio data - int len = c->len/4; // Number of samples in current audio block + int len = c->len/8; // Number of samples in current audio block int nch = c->nch; // Number of channels register int i; diff --git a/libmpdemux/network.h b/libmpdemux/network.h index 0081c88256..bb659fa6ba 100644 --- a/libmpdemux/network.h +++ b/libmpdemux/network.h @@ -26,7 +26,7 @@ #define BUFFER_SIZE 2048 typedef struct { - char *mime_type; + const char *mime_type; int demuxer_type; } mime_struct_t; diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 445af56125..394a9d0b3a 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -89,7 +89,7 @@ void glAdjustAlignment(int stride) { struct gl_name_map_struct { GLint value; - char *name; + const char *name; }; #undef MAP @@ -253,8 +253,8 @@ static void *setNull(const GLubyte *s) { typedef struct { void **funcptr; - char *extstr; - char *funcnames[7]; + const char *extstr; + const char *funcnames[7]; } extfunc_desc_t; static const extfunc_desc_t extfuncs[] = { @@ -914,7 +914,7 @@ static void add_scaler(int scaler, char **prog_pos, int *remain, char *texs, } static const struct { - char *name; + const char *name; GLenum cur; GLenum max; } progstats[] = { diff --git a/m_option.c b/m_option.c index a2c37b6b74..6ed3b57e97 100644 --- a/m_option.c +++ b/m_option.c @@ -996,7 +996,7 @@ m_option_type_t m_option_type_subconfig = { /* FIXME: snyc with img_format.h */ static struct { - char* name; + const char* name; unsigned int fmt; } mp_imgfmt_list[] = { {"444p", IMGFMT_444P}, @@ -1090,7 +1090,7 @@ m_option_type_t m_option_type_imgfmt = { /* FIXME: snyc with af_format.h */ static struct { - char* name; + const char* name; unsigned int fmt; } mp_afmt_list[] = { // SPECIAL diff --git a/m_struct.h b/m_struct.h index 2f7f16dffa..e97659a333 100644 --- a/m_struct.h +++ b/m_struct.h @@ -13,7 +13,7 @@ struct m_option; /// Struct definition typedef struct m_struct_st { /// For error messages and debugging - char* name; + const char* name; /// size of the whole struct unsigned int size; /// Pointer to a struct filled with the default settings diff --git a/subopt-helper.h b/subopt-helper.h index dad3e4d0e5..7b8bd8cb5f 100644 --- a/subopt-helper.h +++ b/subopt-helper.h @@ -20,7 +20,7 @@ typedef int (*opt_test_f)(void *); /** simple structure for defining the option name, type and storage location */ typedef struct opt_s { - char * name; ///< string that identifies the option + const char * name; ///< string that identifies the option int type; ///< option type as defined in subopt-helper.h void * valp; ///< pointer to the mem where the value should be stored opt_test_f test; ///< argument test func ( optional ) |