mirror of https://github.com/mpv-player/mpv
removes unused parentheses lefted behind in the r19075 sizeof(char) cleanups, noticed by dalias
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19079 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b5de6c39e6
commit
a814f0ebcd
|
@ -767,7 +767,7 @@ rmff_header_t *real_setup_and_get_header(rtsp_t *rtsp_session, uint32_t bandwid
|
||||||
printf("real: Stream description size: %u\n", size);
|
printf("real: Stream description size: %u\n", size);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
description=malloc((size+1));
|
description=malloc(size+1);
|
||||||
|
|
||||||
if( rtsp_read_data(rtsp_session, description, size) <= 0) {
|
if( rtsp_read_data(rtsp_session, description, size) <= 0) {
|
||||||
buf = xbuffer_free(buf);
|
buf = xbuffer_free(buf);
|
||||||
|
|
|
@ -352,17 +352,17 @@ static rmff_mdpr_t *rmff_scan_mdpr(const char *data) {
|
||||||
mdpr->duration=BE_32(&data[36]);
|
mdpr->duration=BE_32(&data[36]);
|
||||||
|
|
||||||
mdpr->stream_name_size=data[40];
|
mdpr->stream_name_size=data[40];
|
||||||
mdpr->stream_name=malloc((mdpr->stream_name_size+1));
|
mdpr->stream_name=malloc(mdpr->stream_name_size+1);
|
||||||
memcpy(mdpr->stream_name, &data[41], mdpr->stream_name_size);
|
memcpy(mdpr->stream_name, &data[41], mdpr->stream_name_size);
|
||||||
mdpr->stream_name[mdpr->stream_name_size]=0;
|
mdpr->stream_name[mdpr->stream_name_size]=0;
|
||||||
|
|
||||||
mdpr->mime_type_size=data[41+mdpr->stream_name_size];
|
mdpr->mime_type_size=data[41+mdpr->stream_name_size];
|
||||||
mdpr->mime_type=malloc((mdpr->mime_type_size+1));
|
mdpr->mime_type=malloc(mdpr->mime_type_size+1);
|
||||||
memcpy(mdpr->mime_type, &data[42+mdpr->stream_name_size], mdpr->mime_type_size);
|
memcpy(mdpr->mime_type, &data[42+mdpr->stream_name_size], mdpr->mime_type_size);
|
||||||
mdpr->mime_type[mdpr->mime_type_size]=0;
|
mdpr->mime_type[mdpr->mime_type_size]=0;
|
||||||
|
|
||||||
mdpr->type_specific_len=BE_32(&data[42+mdpr->stream_name_size+mdpr->mime_type_size]);
|
mdpr->type_specific_len=BE_32(&data[42+mdpr->stream_name_size+mdpr->mime_type_size]);
|
||||||
mdpr->type_specific_data=malloc((mdpr->type_specific_len));
|
mdpr->type_specific_data=malloc(mdpr->type_specific_len);
|
||||||
memcpy(mdpr->type_specific_data,
|
memcpy(mdpr->type_specific_data,
|
||||||
&data[46+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len);
|
&data[46+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len);
|
||||||
|
|
||||||
|
@ -383,22 +383,22 @@ static rmff_cont_t *rmff_scan_cont(const char *data) {
|
||||||
cont->object_version);
|
cont->object_version);
|
||||||
}
|
}
|
||||||
cont->title_len=BE_16(&data[10]);
|
cont->title_len=BE_16(&data[10]);
|
||||||
cont->title=malloc((cont->title_len+1));
|
cont->title=malloc(cont->title_len+1);
|
||||||
memcpy(cont->title, &data[12], cont->title_len);
|
memcpy(cont->title, &data[12], cont->title_len);
|
||||||
cont->title[cont->title_len]=0;
|
cont->title[cont->title_len]=0;
|
||||||
pos=cont->title_len+12;
|
pos=cont->title_len+12;
|
||||||
cont->author_len=BE_16(&data[pos]);
|
cont->author_len=BE_16(&data[pos]);
|
||||||
cont->author=malloc((cont->author_len+1));
|
cont->author=malloc(cont->author_len+1);
|
||||||
memcpy(cont->author, &data[pos+2], cont->author_len);
|
memcpy(cont->author, &data[pos+2], cont->author_len);
|
||||||
cont->author[cont->author_len]=0;
|
cont->author[cont->author_len]=0;
|
||||||
pos=pos+2+cont->author_len;
|
pos=pos+2+cont->author_len;
|
||||||
cont->copyright_len=BE_16(&data[pos]);
|
cont->copyright_len=BE_16(&data[pos]);
|
||||||
cont->copyright=malloc((cont->copyright_len+1));
|
cont->copyright=malloc(cont->copyright_len+1);
|
||||||
memcpy(cont->copyright, &data[pos+2], cont->copyright_len);
|
memcpy(cont->copyright, &data[pos+2], cont->copyright_len);
|
||||||
cont->copyright[cont->copyright_len]=0;
|
cont->copyright[cont->copyright_len]=0;
|
||||||
pos=pos+2+cont->copyright_len;
|
pos=pos+2+cont->copyright_len;
|
||||||
cont->comment_len=BE_16(&data[pos]);
|
cont->comment_len=BE_16(&data[pos]);
|
||||||
cont->comment=malloc((cont->comment_len+1));
|
cont->comment=malloc(cont->comment_len+1);
|
||||||
memcpy(cont->comment, &data[pos+2], cont->comment_len);
|
memcpy(cont->comment, &data[pos+2], cont->comment_len);
|
||||||
cont->comment[cont->comment_len]=0;
|
cont->comment[cont->comment_len]=0;
|
||||||
|
|
||||||
|
|
2
vobsub.c
2
vobsub.c
|
@ -1071,7 +1071,7 @@ vobsub_open(const char *const name,const char *const ifo,const int force,void**
|
||||||
vob->spu_streams_current = 0;
|
vob->spu_streams_current = 0;
|
||||||
vob->delay = 0;
|
vob->delay = 0;
|
||||||
vob->forced_subs=0;
|
vob->forced_subs=0;
|
||||||
buf = malloc((strlen(name) + 5));
|
buf = malloc(strlen(name) + 5);
|
||||||
if (buf) {
|
if (buf) {
|
||||||
rar_stream_t *fd;
|
rar_stream_t *fd;
|
||||||
mpeg_t *mpg;
|
mpeg_t *mpg;
|
||||||
|
|
Loading…
Reference in New Issue