Mercurial > mplayer.hg

comparison libmpdemux/demux_realaud.c @ 18505:01b9f29c2fb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some potential integer overflow in memory allocation (mot of these were probably safe or disabled anyway)
author rtognimp
date Sun, 14 May 2006 15:51:05 +0000
parents f70772d02eaa
children 530bca1ca585
comparison
equal deleted inserted replaced
18504:eca613999d6c 18505:01b9f29c2fb5
296 sh->wf->nBlockAlign = 0x14; 296 sh->wf->nBlockAlign = 0x14;
297 break; 297 break;
298 case FOURCC_288: 298 case FOURCC_288:
299 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: 28_8\n"); 299 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: 28_8\n");
300 sh->wf->nBlockAlign = ra_priv->coded_framesize; 300 sh->wf->nBlockAlign = ra_priv->coded_framesize;
301 ra_priv->audio_buf = malloc(ra_priv->sub_packet_h * ra_priv->frame_size); 301 ra_priv->audio_buf = calloc(ra_priv->sub_packet_h, ra_priv->frame_size);
302 break; 302 break;
303 case FOURCC_DNET: 303 case FOURCC_DNET:
304 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET -> AC3\n"); 304 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET -> AC3\n");
305 break; 305 break;
306 case FOURCC_SIPR: 306 case FOURCC_SIPR:
307 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: SIPR\n"); 307 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: SIPR\n");
308 sh->wf->nBlockAlign = ra_priv->coded_framesize; 308 sh->wf->nBlockAlign = ra_priv->coded_framesize;
309 sh->wf->nAvgBytesPerSec = sipr_fl2bps[ra_priv->codec_flavor]; 309 sh->wf->nAvgBytesPerSec = sipr_fl2bps[ra_priv->codec_flavor];
310 ra_priv->audio_buf = malloc(ra_priv->sub_packet_h * ra_priv->frame_size); 310 ra_priv->audio_buf = calloc(ra_priv->sub_packet_h, ra_priv->frame_size);
311 break; 311 break;
312 default: 312 default:
313 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%d)\n", sh->format); 313 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%d)\n", sh->format);
314 } 314 }
315 315