more warning fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17123 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ods15 2005-12-07 10:07:27 +00:00
parent aba4eee72d
commit d23cd76afb
3 changed files with 4 additions and 4 deletions

View File

@ -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);

View File

@ -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;

View File

@ -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;
}
}