diff options
| author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-07 10:07:27 +0000 |
|---|---|---|
| committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-07 10:07:27 +0000 |
| commit | d23cd76afb5b0765b2ebe0c149244c60111ffa68 (patch) | |
| tree | 4bfd76bffcd863ccda0fae4610e35cafef9e5d88 | |
| parent | aba4eee72dd0ddbf862443fd3bc6a7f6927d6323 (diff) | |
| download | mpv-d23cd76afb5b0765b2ebe0c149244c60111ffa68.tar.bz2 mpv-d23cd76afb5b0765b2ebe0c149244c60111ffa68.tar.xz | |
more warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17123 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/ae.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ae.h | 2 | ||||
| -rw-r--r-- | mencoder.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c index fc50965d08..caebd5846b 100644 --- a/libmpcodecs/ae.c +++ b/libmpcodecs/ae.c @@ -82,7 +82,7 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params return NULL; } encoder->bind(encoder, stream); - encoder->decode_buffer = (int*)malloc(encoder->decode_buffer_size); + encoder->decode_buffer = malloc(encoder->decode_buffer_size); if(! encoder->decode_buffer) { free(encoder); diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h index 316af9eb15..b30aa5e9c6 100644 --- a/libmpcodecs/ae.h +++ b/libmpcodecs/ae.h @@ -29,7 +29,7 @@ typedef struct audio_encoder_s { int audio_preload; //in ms int input_format; int min_buffer_size, max_buffer_size; //for init_audio_filters - int *decode_buffer; + unsigned char *decode_buffer; int decode_buffer_size; int decode_buffer_len; void *priv; diff --git a/mencoder.c b/mencoder.c index c5cbd3896e..4e651dfbc9 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1142,7 +1142,7 @@ if(sh_audio){ len = dec_audio(sh_audio, aencoder->decode_buffer, len); mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, - (void*)aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); + aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); if(mux_a->buffer_len < mux_a->wf->nBlockAlign) len = 0; else @@ -1167,7 +1167,7 @@ if(sh_audio){ len = 0; break; } - len = aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, (void*)aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); + len = aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); mux_a->buffer_len += len; } } |