Mercurial > mplayer.hg
changeset 17122:c23ca41ad996
more warning fixes
| author | ods15 |
|---|---|
| date | Wed, 07 Dec 2005 10:07:27 +0000 |
| parents | 119790c08d5c |
| children | f79b39b07cc3 |
| files | libmpcodecs/ae.c libmpcodecs/ae.h mencoder.c |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ae.c Wed Dec 07 09:56:44 2005 +0000 +++ b/libmpcodecs/ae.c Wed Dec 07 10:07:27 2005 +0000 @@ -82,7 +82,7 @@ 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);
--- a/libmpcodecs/ae.h Wed Dec 07 09:56:44 2005 +0000 +++ b/libmpcodecs/ae.h Wed Dec 07 10:07:27 2005 +0000 @@ -29,7 +29,7 @@ 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;
--- a/mencoder.c Wed Dec 07 09:56:44 2005 +0000 +++ b/mencoder.c Wed Dec 07 10:07:27 2005 +0000 @@ -1142,7 +1142,7 @@ 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 @@ 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; } }