diff options
| author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-03 13:21:54 +0000 |
|---|---|---|
| committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-03 13:21:54 +0000 |
| commit | 8f65768bf28cebdaf85ef75d9b0d22bfc35f6fd9 (patch) | |
| tree | 5ed058c4a8f3272b6d8acc136ec13c1491a9c235 /libao2 | |
| parent | 92f2863d63b75e30f13473a5d76cdb19cd5fc982 (diff) | |
| download | mpv-8f65768bf28cebdaf85ef75d9b0d22bfc35f6fd9.tar.bz2 mpv-8f65768bf28cebdaf85ef75d9b0d22bfc35f6fd9.tar.xz | |
rm unnecesary casts from void* - part 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_jack.c | 2 | ||||
| -rw-r--r-- | libao2/ao_macosx.c | 6 | ||||
| -rw-r--r-- | libao2/ao_openal.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c index ce7395e6e3..4242a1dba8 100644 --- a/libao2/ao_jack.c +++ b/libao2/ao_jack.c @@ -240,7 +240,7 @@ static int init(int rate, int channels, int format, int flags) { goto err_out; } if (!client_name) { - client_name = (char *)malloc(40); + client_name = malloc(40); sprintf(client_name, "MPlayer [%d]", getpid()); } client = jack_client_new(client_name); diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c index 6017242146..764f47944d 100644 --- a/libao2/ao_macosx.c +++ b/libao2/ao_macosx.c @@ -221,7 +221,7 @@ OSStatus err; UInt32 size, maxFrames; int aoIsCreated = ao != NULL; - if (!aoIsCreated) ao = (ao_macosx_t *)malloc(sizeof(ao_macosx_t)); + if (!aoIsCreated) ao = malloc(sizeof(ao_macosx_t)); // Build Description for the input format inDesc.mSampleRate=rate; @@ -315,8 +315,8 @@ int aoIsCreated = ao != NULL; ao->num_chunks = NUM_BUFS; ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size; - ao->buffer = aoIsCreated ? (unsigned char *)realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size) - : (unsigned char *)calloc(ao->num_chunks + 1, ao->chunk_size); + ao->buffer = aoIsCreated ? realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size) + : calloc(ao->num_chunks + 1, ao->chunk_size); ao_data.samplerate = inDesc.mSampleRate; ao_data.channels = inDesc.mChannelsPerFrame; diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c index f42ed63427..fcf14dfd4c 100644 --- a/libao2/ao_openal.c +++ b/libao2/ao_openal.c @@ -96,7 +96,7 @@ static int init(int rate, int channels, int format, int flags) { ao_data.bps = channels * rate * 2; ao_data.buffersize = CHUNK_SIZE * NUM_BUF; ao_data.outburst = channels * CHUNK_SIZE; - tmpbuf = (int16_t *)malloc(CHUNK_SIZE); + tmpbuf = malloc(CHUNK_SIZE); return 1; err_out: |