diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-12 11:44:42 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:46 +0200 |
commit | fe6c4fcae203e6f95ae654acf80f912185c853da (patch) | |
tree | 22f073c1bcb6888cadb0ca3ce351d5eb6b06b9fd /libmpdemux | |
parent | fcdeaadeaebdddcb2d743ecdafacea36e7260e36 (diff) | |
download | mpv-fe6c4fcae203e6f95ae654acf80f912185c853da.tar.bz2 mpv-fe6c4fcae203e6f95ae654acf80f912185c853da.tar.xz |
cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)
Replace malloc+memset by calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace some sizeof(type) by sizeof(*pointer)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace sizoef(type) by sizeof(*ptrvar).
Besides being consistent with FFmpeg style,
this reduces the size of a patch to rename these
types to not conflict with the windows.h definitions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace sizeof(type) by sizeof(*ptrvar)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2
Remove a useless cast.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace sizeof(type)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2
Remove a useless cast.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace several sizeof(WAVEFORMATEX)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace one more instance of sizeof(WAVEFORMATEX); fix compilation.
patch by Clément Bœsch, ubitux gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2
Avoid some pointless uses of sizeof() and one related cast.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2
Merge one malloc() + memset() invocation into calloc().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace sizeof(WAVEFORMATEX) occurrences.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace malloc+memset by calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2
Replace sizeof(BITMAPINFOHEADER)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
30 files changed, 105 insertions, 126 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index b1058ae011..033d065606 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -344,7 +344,7 @@ static int asf_init_audio_stream(demuxer_t *demuxer,struct asf_priv* asf, sh_aud uint8_t *buffer = *buf; int pos = *ppos; - sh_audio->wf=calloc((streamh->type_size<sizeof(WAVEFORMATEX))?sizeof(WAVEFORMATEX):streamh->type_size,1); + sh_audio->wf=calloc((streamh->type_size<sizeof(*sh_audio->wf))?sizeof(*sh_audio->wf):streamh->type_size,1); memcpy(sh_audio->wf,buffer,streamh->type_size); le2me_WAVEFORMATEX(sh_audio->wf); if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf,MSGL_V); @@ -493,10 +493,10 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){ len=streamh->type_size-(4+4+1+2); ++video_streams; // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); - sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1); + sh_video->bih=calloc((len<sizeof(*sh_video->bih))?sizeof(*sh_video->bih):len,1); memcpy(sh_video->bih,&buffer[4+4+1+2],len); le2me_BITMAPINFOHEADER(sh_video->bih); - if (sh_video->bih->biSize > len && sh_video->bih->biSize > sizeof(BITMAPINFOHEADER)) + if (sh_video->bih->biSize > len && sh_video->bih->biSize > sizeof(*sh_video->bih)) sh_video->bih->biSize = len; if (sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' ')) { //mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "DVR will probably only work with libavformat, try -demuxer 35 if you have problems\n"); diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 27d1e4a27f..ac3a7f7ae6 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -265,12 +265,12 @@ while(1){ break; } case ckidSTREAMFORMAT: { // read 'strf' if(last_fccType==streamtypeVIDEO){ - sh_video->bih=calloc(FFMAX(chunksize, sizeof(BITMAPINFOHEADER)), 1); + sh_video->bih=calloc(FFMAX(chunksize, sizeof(*sh_video->bih)), 1); // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); - mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'bih', %u bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER)); + mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'bih', %u bytes of %d\n",chunksize,sizeof(*sh_video->bih)); stream_read(demuxer->stream,(char*) sh_video->bih,chunksize); le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian - if (sh_video->bih->biSize > chunksize && sh_video->bih->biSize > sizeof(BITMAPINFOHEADER)) + if (sh_video->bih->biSize > chunksize && sh_video->bih->biSize > sizeof(*sh_video->bih)) sh_video->bih->biSize = chunksize; // fixup MS-RLE header (seems to be broken for <256 color files) if(sh_video->bih->biCompression<=1 && sh_video->bih->biSize==40) @@ -320,15 +320,15 @@ while(1){ } } else if(last_fccType==streamtypeAUDIO){ - unsigned wf_size = chunksize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):chunksize; + unsigned wf_size = chunksize<sizeof(*sh_audio->wf)?sizeof(*sh_audio->wf):chunksize; sh_audio->wf=calloc(wf_size,1); // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize); - mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX)); + mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'wf', %d bytes of %d\n",chunksize,sizeof(*sh_audio->wf)); stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize); le2me_WAVEFORMATEX(sh_audio->wf); if (sh_audio->wf->cbSize != 0 && - wf_size < sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize) { - sh_audio->wf=realloc(sh_audio->wf, sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize); + wf_size < sizeof(*sh_audio->wf)+sh_audio->wf->cbSize) { + sh_audio->wf=realloc(sh_audio->wf, sizeof(*sh_audio->wf)+sh_audio->wf->cbSize); } sh_audio->format=sh_audio->wf->wFormatTag; if (sh_audio->format == 1 && diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index f83bcd3756..e7520a42c5 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -117,12 +117,12 @@ void print_video_header(BITMAPINFOHEADER *h, int verbose_level){ mp_msg(MSGT_HEADER, verbose_level, " biBitCount %d\n", h->biBitCount); mp_msg(MSGT_HEADER, verbose_level, " biCompression %d='%.4s'\n", h->biCompression, (char *)&h->biCompression); mp_msg(MSGT_HEADER, verbose_level, " biSizeImage %d\n", h->biSizeImage); - if (h->biSize > sizeof(BITMAPINFOHEADER)) + if (h->biSize > sizeof(*h)) { int i; uint8_t* p = (uint8_t*)(h + 1); mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); - for (i = 0; i < h->biSize-sizeof(BITMAPINFOHEADER); i++) + for (i = 0; i < h->biSize-sizeof(*h); i++) mp_msg(MSGT_HEADER, verbose_level, "[%x] ", *(p+i)); mp_msg(MSGT_HEADER, verbose_level, "\n"); } diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 38f1d2afd2..16118a4139 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -333,7 +333,7 @@ static int demux_audio_open(demuxer_t* demuxer) { sh_audio->audio.dwSampleSize= 0; sh_audio->audio.dwScale = mp3_found->mpa_spf; sh_audio->audio.dwRate = mp3_found->mp3_freq; - sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); + sh_audio->wf = malloc(sizeof(*sh_audio->wf)); sh_audio->wf->wFormatTag = sh_audio->format; sh_audio->wf->nChannels = mp3_found->mp3_chans; sh_audio->wf->nSamplesPerSec = mp3_found->mp3_freq; @@ -394,7 +394,7 @@ static int demux_audio_open(demuxer_t* demuxer) { mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] Bad wav header length: too long (%d)!!!\n",l); l = 16; } - sh_audio->wf = w = malloc(l > sizeof(WAVEFORMATEX) ? l : sizeof(WAVEFORMATEX)); + sh_audio->wf = w = malloc(l > sizeof(*w) ? l : sizeof(*w)); w->wFormatTag = sh_audio->format = stream_read_word_le(s); w->nChannels = sh_audio->channels = stream_read_word_le(s); w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s); @@ -413,7 +413,7 @@ static int demux_audio_open(demuxer_t* demuxer) { l,w->cbSize); w->cbSize = l; } - stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),w->cbSize); + stream_read(s,(char*)(w + 1),w->cbSize); l -= w->cbSize; if (w->wFormatTag & 0xfffe && w->cbSize >= 22) sh_audio->format = ((WAVEFORMATEXTENSIBLE *)w)->SubFormat; diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 33fc01ab0d..e90e36c1a7 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -299,7 +299,7 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer) sh_video->fps = (double) AVS->video_info->fps_numerator / (double) AVS->video_info->fps_denominator; sh_video->frametime = 1.0 / sh_video->fps; - sh_video->bih = malloc(sizeof(BITMAPINFOHEADER) + (256 * 4)); + sh_video->bih = malloc(sizeof(*sh_video->bih) + (256 * 4)); sh_video->bih->biCompression = sh_video->format; sh_video->bih->biBitCount = avs_bits_per_pixel(AVS->video_info); //sh_video->bih->biPlanes = 2; @@ -332,7 +332,7 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer) demuxer->audio->sh = sh_audio; sh_audio->ds = demuxer->audio; - sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); + sh_audio->wf = malloc(sizeof(*sh_audio->wf)); sh_audio->wf->wFormatTag = sh_audio->format = (AVS->video_info->sample_type == AVS_SAMPLE_FLOAT) ? 0x3 : 0x1; sh_audio->wf->nChannels = sh_audio->channels = AVS->video_info->nchannels; diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c index e337fe1c14..57d8296d80 100644 --- a/libmpdemux/demux_film.c +++ b/libmpdemux/demux_film.c @@ -325,7 +325,7 @@ static demuxer_t* demux_open_film(demuxer_t* demuxer) demuxer->audio->sh = sh_audio; sh_audio->ds = demuxer->audio; - sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); + sh_audio->wf = malloc(sizeof(*sh_audio->wf)); // uncompressed PCM format sh_audio->wf->wFormatTag = 1; @@ -356,7 +356,7 @@ static demuxer_t* demux_open_film(demuxer_t* demuxer) demuxer->audio->sh = sh_audio; sh_audio->ds = demuxer->audio; - sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); + sh_audio->wf = malloc(sizeof(*sh_audio->wf)); // uncompressed PCM format sh_audio->wf->wFormatTag = 1; diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 0a59bff5d8..d82728ffb6 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -279,7 +279,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) sh_video->fps = 5.0f; sh_video->frametime = 1.0f / sh_video->fps; - sh_video->bih = malloc(sizeof(BITMAPINFOHEADER) + (256 * 4)); + sh_video->bih = malloc(sizeof(*sh_video->bih) + (256 * 4)); sh_video->bih->biCompression = sh_video->format; sh_video->bih->biWidth = priv->w = (uint16_t)gif->SWidth; sh_video->bih->biHeight = priv->h = (uint16_t)gif->SHeight; diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index af77d6aef3..098ee3786d 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -275,7 +275,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { break; stream_type = "audio"; priv->astreams[priv->audio_streams] = i; - wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); + wf= calloc(sizeof(*wf) + codec->extradata_size, 1); // mp4a tag is used for all mp4 files no matter what they actually contain if(codec->codec_tag == MKTAG('m', 'p', '4', 'a')) codec->codec_tag= 0; @@ -351,7 +351,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { if(!sh_video) break; stream_type = "video"; priv->vstreams[priv->video_streams] = i; - bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); + bih=calloc(sizeof(*bih) + codec->extradata_size,1); if(codec->codec_id == CODEC_ID_RAWVIDEO) { switch (codec->pix_fmt) { @@ -361,7 +361,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { } if(!codec->codec_tag) codec->codec_tag= mp_av_codec_get_tag(mp_bmp_taglists, codec->codec_id); - bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size; + bih->biSize= sizeof(*bih) + codec->extradata_size; bih->biWidth= codec->width; bih->biHeight= codec->height; bih->biBitCount= codec->bits_per_coded_sample; diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c index 7f95e36de0..05cec05282 100644 --- a/libmpdemux/demux_lmlm4.c +++ b/libmpdemux/demux_lmlm4.c @@ -309,8 +309,7 @@ static demuxer_t* demux_open_lmlm4(demuxer_t* demuxer){ sh_video->disp_h = 480; sh_video->format = mmioFOURCC('D','I','V','X'); - sh_video->bih = malloc(sizeof(BITMAPINFOHEADER)); - memset(sh_video->bih, 0, sizeof(BITMAPINFOHEADER)); + sh_video->bih = calloc(1, sizeof(*sh_video->bih)); /* these are false values */ sh_video->bih->biSize = 40; @@ -325,8 +324,7 @@ static demuxer_t* demux_open_lmlm4(demuxer_t* demuxer){ demuxer->audio->sh = sh_audio; sh_audio->ds = demuxer->audio; - sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); - memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX)); + sh_audio->wf = calloc(1, sizeof(*sh_audio->wf)); sh_audio->samplerate = 48000; sh_audio->wf->wBitsPerSample = 16; diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index cc6f6be6a8..e4405aedad 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -159,8 +159,7 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){ sh_video->frametime = 1 / sh_video->fps; // emulate BITMAPINFOHEADER: - sh_video->bih=malloc(sizeof(BITMAPINFOHEADER)); - memset(sh_video->bih,0,sizeof(BITMAPINFOHEADER)); + sh_video->bih=calloc(1, sizeof(*sh_video->bih)); sh_video->bih->biSize=40; sh_video->bih->biWidth = mf_w; sh_video->bih->biHeight = mf_h; diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 589acc8695..dd75061f6c 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1177,7 +1177,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track, BITMAPINFOHEADER *src; if (track->private_data == NULL - || track->private_size < sizeof(BITMAPINFOHEADER)) + || track->private_size < sizeof(*bih)) return 1; src = (BITMAPINFOHEADER *) track->private_data; @@ -1193,17 +1193,17 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track, bih->biYPelsPerMeter = le2me_32(src->biYPelsPerMeter); bih->biClrUsed = le2me_32(src->biClrUsed); bih->biClrImportant = le2me_32(src->biClrImportant); - memcpy((char *) bih + sizeof(BITMAPINFOHEADER), - (char *) src + sizeof(BITMAPINFOHEADER), - track->private_size - sizeof(BITMAPINFOHEADER)); + memcpy(bih + 1, + src + 1, + track->private_size - sizeof(*bih)); if (track->v_width == 0) track->v_width = bih->biWidth; if (track->v_height == 0) track->v_height = bih->biHeight; } else { - bih = calloc(1, sizeof(BITMAPINFOHEADER)); - bih->biSize = sizeof(BITMAPINFOHEADER); + bih = calloc(1, sizeof(*bih)); + bih->biSize = sizeof(*bih); bih->biWidth = track->v_width; bih->biHeight = track->v_height; bih->biBitCount = 24; @@ -1221,7 +1221,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track, src = (uint8_t *) track->private_data + RVPROPERTIES_SIZE; cnt = track->private_size - RVPROPERTIES_SIZE; - bih = realloc(bih, sizeof(BITMAPINFOHEADER) + 8 + cnt); + bih = realloc(bih, sizeof(*bih) + 8 + cnt); bih->biSize = 48 + cnt; bih->biPlanes = 1; type2 = AV_RB32(src - 4); @@ -1324,8 +1324,8 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, sh_a->lang = strdup(track->language); sh_a->default_track = track->default_track; sh_a->ds = demuxer->audio; - sh_a->wf = malloc(sizeof(WAVEFORMATEX)); - if (track->ms_compat && (track->private_size >= sizeof(WAVEFORMATEX))) { + sh_a->wf = malloc(sizeof(*sh_a->wf)); + if (track->ms_compat && (track->private_size >= sizeof(*sh_a->wf))) { WAVEFORMATEX *wf = (WAVEFORMATEX *) track->private_data; sh_a->wf = realloc(sh_a->wf, track->private_size); sh_a->wf->wFormatTag = le2me_16(wf->wFormatTag); @@ -1334,9 +1334,9 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, sh_a->wf->nAvgBytesPerSec = le2me_32(wf->nAvgBytesPerSec); sh_a->wf->nBlockAlign = le2me_16(wf->nBlockAlign); sh_a->wf->wBitsPerSample = le2me_16(wf->wBitsPerSample); - sh_a->wf->cbSize = track->private_size - sizeof(WAVEFORMATEX); + sh_a->wf->cbSize = track->private_size - sizeof(*sh_a->wf); memcpy(sh_a->wf + 1, wf + 1, - track->private_size - sizeof(WAVEFORMATEX)); + track->private_size - sizeof(*sh_a->wf)); if (track->a_sfreq == 0.0) track->a_sfreq = sh_a->wf->nSamplesPerSec; if (track->a_channels == 0) @@ -1345,7 +1345,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, track->a_bps = sh_a->wf->wBitsPerSample; track->a_formattag = sh_a->wf->wFormatTag; } else { - memset(sh_a->wf, 0, sizeof(WAVEFORMATEX)); + memset(sh_a->wf, 0, sizeof(*sh_a->wf)); if (!strcmp(track->codec_id, MKV_A_MP3) || !strcmp(track->codec_id, MKV_A_MP2)) track->a_formattag = 0x0055; @@ -1489,7 +1489,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, } } else if (track->a_formattag == mmioFOURCC('v', 'r', 'b', 's')) { /* VORBIS */ sh_a->wf->cbSize = track->private_size; - sh_a->wf = realloc(sh_a->wf, sizeof(WAVEFORMATEX) + sh_a->wf->cbSize); + sh_a->wf = realloc(sh_a->wf, sizeof(*sh_a->wf) + sh_a->wf->cbSize); memcpy((unsigned char *) (sh_a->wf + 1), track->private_data, sh_a->wf->cbSize); } else if (track->private_size >= RAPROPERTIES4_SIZE @@ -1520,7 +1520,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, codecdata_length = AV_RB32(src); src += 4; sh_a->wf->cbSize = codecdata_length; - sh_a->wf = realloc(sh_a->wf, sizeof(WAVEFORMATEX) + sh_a->wf->cbSize); + sh_a->wf = realloc(sh_a->wf, sizeof(*sh_a->wf) + sh_a->wf->cbSize); memcpy(((char *) (sh_a->wf + 1)), src, codecdata_length); switch (track->a_formattag) { @@ -1571,8 +1571,8 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, size = track->private_size; } else { sh_a->format = mmioFOURCC('f', 'L', 'a', 'C'); - ptr = track->private_data + sizeof(WAVEFORMATEX); - size = track->private_size - sizeof(WAVEFORMATEX); + ptr = track->private_data + sizeof(*sh_a->wf); + size = track->private_size - sizeof(*sh_a->wf); } if (size < 4 || ptr[0] != 'f' || ptr[1] != 'L' || ptr[2] != 'a' || ptr[3] != 'C') { @@ -1586,7 +1586,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, } } else if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K') || track->a_formattag == mmioFOURCC('T', 'R', 'H', 'D')) { /* do nothing, still works */ } else if (!track->ms_compat - || (track->private_size < sizeof(WAVEFORMATEX))) { + || (track->private_size < sizeof(*sh_a->wf))) { free_sh_audio(demuxer, track->id); return 1; } @@ -2003,8 +2003,7 @@ static void handle_realaudio(demuxer_t *demuxer, mkv_track_t *track, track->audio_filepos = demuxer->filepos; if (++(track->sub_packet_cnt) == sph) { int apk_usize = - ((WAVEFORMATEX *) ((sh_audio_t *) demuxer->audio->sh)->wf)-> - nBlockAlign; + ((sh_audio_t *) demuxer->audio->sh)->wf->nBlockAlign; track->sub_packet_cnt = 0; // Release all the audio packets for (x = 0; x < sph * w / apk_usize; x++) { diff --git a/libmpdemux/demux_mng.c b/libmpdemux/demux_mng.c index 719f11e35b..525972936a 100644 --- a/libmpdemux/demux_mng.c +++ b/libmpdemux/demux_mng.c @@ -443,7 +443,7 @@ static demuxer_t * demux_mng_open(demuxer_t * demuxer) sh_video->frametime = 1.0f / sh_video->fps; // set video frame parameters - sh_video->bih = malloc(sizeof(BITMAPINFOHEADER)); + sh_video->bih = malloc(sizeof(*sh_video->bih)); sh_video->bih->biCompression = sh_video->format; sh_video->bih->biWidth = mng_priv->width; sh_video->bih->biHeight = mng_priv->height; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index eca214caa0..432d0cad18 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -336,11 +336,10 @@ typedef struct { static int mov_check_file(demuxer_t* demuxer){ int flags=0; int no=0; - mov_priv_t* priv=malloc(sizeof(mov_priv_t)); + mov_priv_t* priv=calloc(1, sizeof(mov_priv_t)); mp_msg(MSGT_DEMUX,MSGL_V,"Checking for MOV\n"); - memset(priv,0,sizeof(mov_priv_t)); priv->current_sub = -1; while(1){ @@ -916,8 +915,7 @@ quit_vorbis_block: fclose(f); } #endif // Emulate WAVEFORMATEX struct: - sh->wf=malloc(sizeof(WAVEFORMATEX) + (is_vorbis ? sh->codecdata_len : 0)); - memset(sh->wf,0,sizeof(WAVEFORMATEX)); + sh->wf=calloc(1, sizeof(*sh->wf) + (is_vorbis ? sh->codecdata_len : 0)); sh->wf->nChannels=sh->channels; sh->wf->wBitsPerSample=(trak->stdata[18]<<8)+trak->stdata[19]; // sh->wf->nSamplesPerSec=trak->timescale; @@ -1161,8 +1159,7 @@ static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) { // emulate BITMAPINFOHEADER: if (palette_count) { - sh->bih=malloc(sizeof(BITMAPINFOHEADER) + palette_count * 4); - memset(sh->bih,0,sizeof(BITMAPINFOHEADER) + palette_count * 4); + sh->bih=calloc(1, sizeof(*sh->bih) + palette_count * 4); sh->bih->biSize=40 + palette_count * 4; // fetch the relevant fields flag = AV_RB16(&trak->stdata[hdr_ptr]); @@ -1246,20 +1243,18 @@ static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) { else { if (trak->fourcc == mmioFOURCC('a','v','c','1')) { - if (trak->stream_header_len > 0xffffffff - sizeof(BITMAPINFOHEADER)) { + if (trak->stream_header_len > 0xffffffff - sizeof(*sh->bih)) { mp_msg(MSGT_DEMUXER, MSGL_ERR, "Invalid extradata size %d, skipping\n",trak->stream_header_len); trak->stream_header_len = 0; } - sh->bih=malloc(sizeof(BITMAPINFOHEADER) + trak->stream_header_len); - memset(sh->bih,0,sizeof(BITMAPINFOHEADER) + trak->stream_header_len); + sh->bih=calloc(1, sizeof(*sh->bih) + trak->stream_header_len); sh->bih->biSize=40 + trak->stream_header_len; memcpy(((unsigned char *)sh->bih)+40, trak->stream_header, trak->stream_header_len); free (trak->stream_header); trak->stream_header_len = 0; trak->stream_header = NULL; } else { - sh->bih=malloc(sizeof(BITMAPINFOHEADER)); - memset(sh->bih,0,sizeof(BITMAPINFOHEADER)); + sh->bih=calloc(1, sizeof(*sh->bih)); sh->bih->biSize=40; } } @@ -1328,8 +1323,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak return; } if(!priv->track_db) mp_msg(MSGT_DEMUX, MSGL_V, "--------------\n"); - trak=malloc(sizeof(mov_track_t)); - memset(trak,0,sizeof(mov_track_t)); + trak=calloc(1, sizeof(mov_track_t)); mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Track #%d:\n",priv->track_db); trak->id=priv->track_db; priv->tracks[priv->track_db]=trak; diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index 3d2d413a4a..2b2f6d2438 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -233,11 +233,11 @@ static demuxer_t* demux_open_rtp(demuxer_t* demuxer) sess, &buff, NULL); if (buff.len) { - wf = calloc(1,sizeof(WAVEFORMATEX)+buff.len); + wf = calloc(1,sizeof(*wf)+buff.len); wf->cbSize = buff.len; memcpy(wf+1, buff.data, buff.len); } else { - wf = calloc(1,sizeof(WAVEFORMATEX)); + wf = calloc(1,sizeof(*wf)); } sh_audio->wf = wf; @@ -269,12 +269,12 @@ static demuxer_t* demux_open_rtp(demuxer_t* demuxer) sess, &buff, &fps); if (buff.len) { - bih = calloc(1,sizeof(BITMAPINFOHEADER)+buff.len); - bih->biSize = sizeof(BITMAPINFOHEADER)+buff.len; + bih = calloc(1,sizeof(*bih)+buff.len); + bih->biSize = sizeof(*bih)+buff.len; memcpy(bih+1, buff.data, buff.len); } else { - bih = calloc(1,sizeof(BITMAPINFOHEADER)); - bih->biSize = sizeof(BITMAPINFOHEADER); + bih = calloc(1,sizeof(*bih)); + bih->biSize = sizeof(*bih); } sh_video = new_sh_video(demuxer,0); diff --git a/libmpdemux/demux_nsv.c b/libmpdemux/demux_nsv.c index 1d0856a80d..a5257ef083 100644 --- a/libmpdemux/demux_nsv.c +++ b/libmpdemux/demux_nsv.c @@ -225,8 +225,8 @@ static demuxer_t* demux_open_nsv ( demuxer_t* demuxer ) // new video stream! parse header sh_video->disp_w=hdr[12]|(hdr[13]<<8); sh_video->disp_h=hdr[14]|(hdr[15]<<8); - sh_video->bih=calloc(1,sizeof(BITMAPINFOHEADER)); - sh_video->bih->biSize=sizeof(BITMAPINFOHEADER); + sh_video->bih=calloc(1,sizeof(*sh_video->bih)); + sh_video->bih->biSize=sizeof(*sh_video->bih); sh_video->bih->biPlanes=1; sh_video->bih->biBitCount=24; sh_video->bih->biWidth=hdr[12]|(hdr[13]<<8); diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c index 3c7f89b8d7..efa20e0c47 100644 --- a/libmpdemux/demux_nut.c +++ b/libmpdemux/demux_nut.c @@ -110,7 +110,7 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { for (i = 0; s[i].type != -1 && i < 2; i++) switch(s[i].type) { case NUT_AUDIO_CLASS: { WAVEFORMATEX *wf = - calloc(sizeof(WAVEFORMATEX) + + calloc(sizeof(*wf) + s[i].codec_specific_len, 1); sh_audio_t* sh_audio = new_sh_audio(demuxer, i); int j; @@ -146,7 +146,7 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { } case NUT_VIDEO_CLASS: { BITMAPINFOHEADER * bih = - calloc(sizeof(BITMAPINFOHEADER) + + calloc(sizeof(*bih) + s[i].codec_specific_len, 1); sh_video_t * sh_video = new_sh_video(demuxer, i); int j; @@ -170,7 +170,7 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { s[i].sample_width / (float)s[i].sample_height; sh_video->i_bps = 0; // FIXME - bih->biSize = sizeof(BITMAPINFOHEADER) + + bih->biSize = sizeof(*bih) + s[i].codec_specific_len; bih |