[MPlayer-cvslog] r19075 - in trunk: libmpdemux/realrtsp/real.c libmpdemux/realrtsp/rmff.c libmpdemux/realrtsp/sdpplin.c vobsub.c

[reynaldo]

Author: reynaldo
Date: Fri Jul 14 00:11:47 2006
New Revision: 19075

Modified:
   trunk/libmpdemux/realrtsp/real.c
   trunk/libmpdemux/realrtsp/rmff.c
   trunk/libmpdemux/realrtsp/sdpplin.c
   trunk/vobsub.c

Log:
more sizeof(char) fun

Modified: trunk/libmpdemux/realrtsp/real.c
==============================================================================
--- trunk/libmpdemux/realrtsp/real.c	(original)
+++ trunk/libmpdemux/realrtsp/real.c	Fri Jul 14 00:11:47 2006
@@ -767,7 +767,7 @@
   printf("real: Stream description size: %u\n", size);
 #endif
 
-  description=malloc(sizeof(char)*(size+1));
+  description=malloc((size+1));
 
   if( rtsp_read_data(rtsp_session, description, size) <= 0) {
     buf = xbuffer_free(buf);

Modified: trunk/libmpdemux/realrtsp/rmff.c
==============================================================================
--- trunk/libmpdemux/realrtsp/rmff.c	(original)
+++ trunk/libmpdemux/realrtsp/rmff.c	Fri Jul 14 00:11:47 2006
@@ -352,17 +352,17 @@
   mdpr->duration=BE_32(&data[36]);
   
   mdpr->stream_name_size=data[40];
-  mdpr->stream_name=malloc(sizeof(char)*(mdpr->stream_name_size+1));
+  mdpr->stream_name=malloc((mdpr->stream_name_size+1));
   memcpy(mdpr->stream_name, &data[41], mdpr->stream_name_size);
   mdpr->stream_name[mdpr->stream_name_size]=0;
   
   mdpr->mime_type_size=data[41+mdpr->stream_name_size];
-  mdpr->mime_type=malloc(sizeof(char)*(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);
   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_data=malloc(sizeof(char)*(mdpr->type_specific_len));
+  mdpr->type_specific_data=malloc((mdpr->type_specific_len));
   memcpy(mdpr->type_specific_data, 
       &data[46+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len);
   
@@ -383,22 +383,22 @@
       cont->object_version);
   }
   cont->title_len=BE_16(&data[10]);
-  cont->title=malloc(sizeof(char)*(cont->title_len+1));
+  cont->title=malloc((cont->title_len+1));
   memcpy(cont->title, &data[12], cont->title_len);
   cont->title[cont->title_len]=0;
   pos=cont->title_len+12;
   cont->author_len=BE_16(&data[pos]);
-  cont->author=malloc(sizeof(char)*(cont->author_len+1));
+  cont->author=malloc((cont->author_len+1));
   memcpy(cont->author, &data[pos+2], cont->author_len);
   cont->author[cont->author_len]=0;
   pos=pos+2+cont->author_len;
   cont->copyright_len=BE_16(&data[pos]);
-  cont->copyright=malloc(sizeof(char)*(cont->copyright_len+1));
+  cont->copyright=malloc((cont->copyright_len+1));
   memcpy(cont->copyright, &data[pos+2], cont->copyright_len);
   cont->copyright[cont->copyright_len]=0;
   pos=pos+2+cont->copyright_len;
   cont->comment_len=BE_16(&data[pos]);
-  cont->comment=malloc(sizeof(char)*(cont->comment_len+1));
+  cont->comment=malloc((cont->comment_len+1));
   memcpy(cont->comment, &data[pos+2], cont->comment_len);
   cont->comment[cont->comment_len]=0;
 
@@ -626,7 +626,7 @@
     mdpr->mime_type_size=strlen(mime_type);
   }
   mdpr->type_specific_len=type_specific_len;
-  mdpr->type_specific_data=malloc(sizeof(char)*type_specific_len);
+  mdpr->type_specific_data=malloc(type_specific_len);
   memcpy(mdpr->type_specific_data,type_specific_data,type_specific_len);
   mdpr->mlti_data=NULL;
   

Modified: trunk/libmpdemux/realrtsp/sdpplin.c
==============================================================================
--- trunk/libmpdemux/realrtsp/sdpplin.c	(original)
+++ trunk/libmpdemux/realrtsp/sdpplin.c	Fri Jul 14 00:11:47 2006
@@ -203,7 +203,7 @@
 
     if(filter(*data,"a=OpaqueData:buffer;",&buf)) {
       decoded = b64_decode(buf, decoded, &(desc->mlti_data_size));
-      desc->mlti_data=malloc(sizeof(char)*desc->mlti_data_size);
+      desc->mlti_data=malloc(desc->mlti_data_size);
       memcpy(desc->mlti_data, decoded, desc->mlti_data_size);
       handled=1;
       *data=nl(*data);

Modified: trunk/vobsub.c
==============================================================================
--- trunk/vobsub.c	(original)
+++ trunk/vobsub.c	Fri Jul 14 00:11:47 2006
@@ -1071,7 +1071,7 @@
 	vob->spu_streams_current = 0;
 	vob->delay = 0;
 	vob->forced_subs=0;
-	buf = malloc((strlen(name) + 5) * sizeof(char));
+	buf = malloc((strlen(name) + 5));
 	if (buf) {
 	    rar_stream_t *fd;
 	    mpeg_t *mpg;