Mercurial > mplayer.hg
changeset 32114:9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
| author | reimar |
|---|---|
| date | Sun, 12 Sep 2010 13:49:08 +0000 |
| parents | e21b0baab10c |
| children | 38ffbeed52a0 |
| files | mencoder.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mencoder.c Sun Sep 12 13:38:59 2010 +0000 +++ b/mencoder.c Sun Sep 12 13:49:08 2010 +0000 @@ -927,8 +927,8 @@ } else { - mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER)); - mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); + mux_v->bih=calloc(1,sizeof(*mux_v->bih)); + mux_v->bih->biSize=sizeof(*mux_v->bih); mux_v->bih->biWidth=sh_video->disp_w; mux_v->bih->biHeight=sh_video->disp_h; mux_v->bih->biCompression=sh_video->format; @@ -967,8 +967,8 @@ break; case VCODEC_FRAMENO: if (!curfile) { - mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER)); - mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); + mux_v->bih=calloc(1,sizeof(*mux_v->bih)); + mux_v->bih->biSize=sizeof(*mux_v->bih); mux_v->bih->biWidth=sh_video->disp_w; mux_v->bih->biHeight=sh_video->disp_h; mux_v->bih->biPlanes=1; @@ -1154,11 +1154,11 @@ mencoder_exit(1,NULL); } if (sh_audio->wf){ - mux_a->wf=malloc(sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); - memcpy(mux_a->wf, sh_audio->wf, sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); + mux_a->wf=malloc(sizeof(*mux_a->wf) + sh_audio->wf->cbSize); + memcpy(mux_a->wf, sh_audio->wf, sizeof(*mux_a->wf) + sh_audio->wf->cbSize); if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; } else { - mux_a->wf = malloc(sizeof(WAVEFORMATEX)); + mux_a->wf = malloc(sizeof(*mux_a->wf)); mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize; mux_a->wf->wFormatTag = sh_audio->format; mux_a->wf->nChannels = sh_audio->channels;