* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: rmff.c,v 1.7 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id$
*
* functions for real media file format
* adopted from joschkas real tools
* writes header data to a buffer
*/
-static void rmff_dump_fileheader(rmff_fileheader_t *fileheader, char *buffer) {
+static int rmff_dump_fileheader(rmff_fileheader_t *fileheader, uint8_t *buffer, int bufsize) {
+ if (!fileheader) return 0;
+ if (bufsize < RMFF_FILEHEADER_SIZE)
+ return -1;
- if (!fileheader) return;
- fileheader->object_id=BE_32(&fileheader->object_id);
- fileheader->size=BE_32(&fileheader->size);
- fileheader->object_version=BE_16(&fileheader->object_version);
- fileheader->file_version=BE_32(&fileheader->file_version);
- fileheader->num_headers=BE_32(&fileheader->num_headers);
+ fileheader->object_id=BE_32(&fileheader->object_id);
+ fileheader->size=BE_32(&fileheader->size);
+ fileheader->object_version=BE_16(&fileheader->object_version);
+ fileheader->file_version=BE_32(&fileheader->file_version);
+ fileheader->num_headers=BE_32(&fileheader->num_headers);
- memcpy(buffer, fileheader, 8);
- memcpy(&buffer[8], &fileheader->object_version, 2);
- memcpy(&buffer[10], &fileheader->file_version, 8);
+ memcpy(buffer, fileheader, 8);
+ memcpy(&buffer[8], &fileheader->object_version, 2);
+ memcpy(&buffer[10], &fileheader->file_version, 8);
- fileheader->size=BE_32(&fileheader->size);
- fileheader->object_version=BE_16(&fileheader->object_version);
- fileheader->file_version=BE_32(&fileheader->file_version);
- fileheader->num_headers=BE_32(&fileheader->num_headers);
- fileheader->object_id=BE_32(&fileheader->object_id);
-}
+ fileheader->size=BE_32(&fileheader->size);
+ fileheader->object_version=BE_16(&fileheader->object_version);
+ fileheader->file_version=BE_32(&fileheader->file_version);
+ fileheader->num_headers=BE_32(&fileheader->num_headers);
+ fileheader->object_id=BE_32(&fileheader->object_id);
-static void rmff_dump_prop(rmff_prop_t *prop, char *buffer) {
-
- if (!prop) return;
- prop->object_id=BE_32(&prop->object_id);
- prop->size=BE_32(&prop->size);
- prop->object_version=BE_16(&prop->object_version);
- prop->max_bit_rate=BE_32(&prop->max_bit_rate);
- prop->avg_bit_rate=BE_32(&prop->avg_bit_rate);
- prop->max_packet_size=BE_32(&prop->max_packet_size);
- prop->avg_packet_size=BE_32(&prop->avg_packet_size);
- prop->num_packets=BE_32(&prop->num_packets);
- prop->duration=BE_32(&prop->duration);
- prop->preroll=BE_32(&prop->preroll);
- prop->index_offset=BE_32(&prop->index_offset);
- prop->data_offset=BE_32(&prop->data_offset);
- prop->num_streams=BE_16(&prop->num_streams);
- prop->flags=BE_16(&prop->flags);
-
- memcpy(buffer, prop, 8);
- memcpy(&buffer[8], &prop->object_version, 2);
- memcpy(&buffer[10], &prop->max_bit_rate, 36);
- memcpy(&buffer[46], &prop->num_streams, 2);
- memcpy(&buffer[48], &prop->flags, 2);
-
- prop->size=BE_32(&prop->size);
- prop->object_version=BE_16(&prop->object_version);
- prop->max_bit_rate=BE_32(&prop->max_bit_rate);
- prop->avg_bit_rate=BE_32(&prop->avg_bit_rate);
- prop->max_packet_size=BE_32(&prop->max_packet_size);
- prop->avg_packet_size=BE_32(&prop->avg_packet_size);
- prop->num_packets=BE_32(&prop->num_packets);
- prop->duration=BE_32(&prop->duration);
- prop->preroll=BE_32(&prop->preroll);
- prop->index_offset=BE_32(&prop->index_offset);
- prop->data_offset=BE_32(&prop->data_offset);
- prop->num_streams=BE_16(&prop->num_streams);
- prop->flags=BE_16(&prop->flags);
- prop->object_id=BE_32(&prop->object_id);
+ return RMFF_FILEHEADER_SIZE;
}
-static void rmff_dump_mdpr(rmff_mdpr_t *mdpr, char *buffer) {
-
- int s1, s2, s3;
-
- if (!mdpr) return;
- mdpr->object_id=BE_32(&mdpr->object_id);
- mdpr->size=BE_32(&mdpr->size);
- mdpr->object_version=BE_16(&mdpr->object_version);
- mdpr->stream_number=BE_16(&mdpr->stream_number);
- mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate);
- mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate);
- mdpr->max_packet_size=BE_32(&mdpr->max_packet_size);
- mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size);
- mdpr->start_time=BE_32(&mdpr->start_time);
- mdpr->preroll=BE_32(&mdpr->preroll);
- mdpr->duration=BE_32(&mdpr->duration);
-
- memcpy(buffer, mdpr, 8);
- memcpy(&buffer[8], &mdpr->object_version, 2);
- memcpy(&buffer[10], &mdpr->stream_number, 2);
- memcpy(&buffer[12], &mdpr->max_bit_rate, 28);
- memcpy(&buffer[40], &mdpr->stream_name_size, 1);
- s1=mdpr->stream_name_size;
- memcpy(&buffer[41], mdpr->stream_name, s1);
-
- memcpy(&buffer[41+s1], &mdpr->mime_type_size, 1);
- s2=mdpr->mime_type_size;
- memcpy(&buffer[42+s1], mdpr->mime_type, s2);
-
- mdpr->type_specific_len=BE_32(&mdpr->type_specific_len);
- memcpy(&buffer[42+s1+s2], &mdpr->type_specific_len, 4);
- mdpr->type_specific_len=BE_32(&mdpr->type_specific_len);
- s3=mdpr->type_specific_len;
- memcpy(&buffer[46+s1+s2], mdpr->type_specific_data, s3);
-
- mdpr->size=BE_32(&mdpr->size);
- mdpr->stream_number=BE_16(&mdpr->stream_number);
- mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate);
- mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate);
- mdpr->max_packet_size=BE_32(&mdpr->max_packet_size);
- mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size);
- mdpr->start_time=BE_32(&mdpr->start_time);
- mdpr->preroll=BE_32(&mdpr->preroll);
- mdpr->duration=BE_32(&mdpr->duration);
- mdpr->object_id=BE_32(&mdpr->object_id);
+static int rmff_dump_prop(rmff_prop_t *prop, uint8_t *buffer, int bufsize) {
+
+ if (!prop) return 0;
+
+ if (bufsize < RMFF_PROPHEADER_SIZE)
+ return -1;
+
+ prop->object_id=BE_32(&prop->object_id);
+ prop->size=BE_32(&prop->size);
+ prop->object_version=BE_16(&prop->object_version);
+ prop->max_bit_rate=BE_32(&prop->max_bit_rate);
+ prop->avg_bit_rate=BE_32(&prop->avg_bit_rate);
+ prop->max_packet_size=BE_32(&prop->max_packet_size);
+ prop->avg_packet_size=BE_32(&prop->avg_packet_size);
+ prop->num_packets=BE_32(&prop->num_packets);
+ prop->duration=BE_32(&prop->duration);
+ prop->preroll=BE_32(&prop->preroll);
+ prop->index_offset=BE_32(&prop->index_offset);
+ prop->data_offset=BE_32(&prop->data_offset);
+ prop->num_streams=BE_16(&prop->num_streams);
+ prop->flags=BE_16(&prop->flags);
+
+ memcpy(buffer, prop, 8);
+ memcpy(&buffer[8], &prop->object_version, 2);
+ memcpy(&buffer[10], &prop->max_bit_rate, 36);
+ memcpy(&buffer[46], &prop->num_streams, 2);
+ memcpy(&buffer[48], &prop->flags, 2);
+
+ prop->size=BE_32(&prop->size);
+ prop->object_version=BE_16(&prop->object_version);
+ prop->max_bit_rate=BE_32(&prop->max_bit_rate);
+ prop->avg_bit_rate=BE_32(&prop->avg_bit_rate);
+ prop->max_packet_size=BE_32(&prop->max_packet_size);
+ prop->avg_packet_size=BE_32(&prop->avg_packet_size);
+ prop->num_packets=BE_32(&prop->num_packets);
+ prop->duration=BE_32(&prop->duration);
+ prop->preroll=BE_32(&prop->preroll);
+ prop->index_offset=BE_32(&prop->index_offset);
+ prop->data_offset=BE_32(&prop->data_offset);
+ prop->num_streams=BE_16(&prop->num_streams);
+ prop->flags=BE_16(&prop->flags);
+ prop->object_id=BE_32(&prop->object_id);
+
+ return RMFF_PROPHEADER_SIZE;
+}
+static int rmff_dump_mdpr(rmff_mdpr_t *mdpr, uint8_t *buffer, unsigned int bufsize) {
+
+ int s1, s2, s3;
+
+ if (!mdpr) return 0;
+ if (bufsize < RMFF_MDPRHEADER_SIZE + mdpr->type_specific_len +
+ mdpr->stream_name_size + mdpr->mime_type_size)
+ return -1;
+
+ mdpr->object_id=BE_32(&mdpr->object_id);
+ mdpr->size=BE_32(&mdpr->size);
+ mdpr->object_version=BE_16(&mdpr->object_version);
+ mdpr->stream_number=BE_16(&mdpr->stream_number);
+ mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate);
+ mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate);
+ mdpr->max_packet_size=BE_32(&mdpr->max_packet_size);
+ mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size);
+ mdpr->start_time=BE_32(&mdpr->start_time);
+ mdpr->preroll=BE_32(&mdpr->preroll);
+ mdpr->duration=BE_32(&mdpr->duration);
+
+ memcpy(buffer, mdpr, 8);
+ memcpy(&buffer[8], &mdpr->object_version, 2);
+ memcpy(&buffer[10], &mdpr->stream_number, 2);
+ memcpy(&buffer[12], &mdpr->max_bit_rate, 28);
+ memcpy(&buffer[40], &mdpr->stream_name_size, 1);
+ s1=mdpr->stream_name_size;
+ memcpy(&buffer[41], mdpr->stream_name, s1);
+
+ memcpy(&buffer[41+s1], &mdpr->mime_type_size, 1);
+ s2=mdpr->mime_type_size;
+ memcpy(&buffer[42+s1], mdpr->mime_type, s2);
+
+ mdpr->type_specific_len=BE_32(&mdpr->type_specific_len);
+ memcpy(&buffer[42+s1+s2], &mdpr->type_specific_len, 4);
+ mdpr->type_specific_len=BE_32(&mdpr->type_specific_len);
+ s3=mdpr->type_specific_len;
+ memcpy(&buffer[46+s1+s2], mdpr->type_specific_data, s3);
+
+ mdpr->size=BE_32(&mdpr->size);
+ mdpr->stream_number=BE_16(&mdpr->stream_number);
+ mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate);
+ mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate);
+ mdpr->max_packet_size=BE_32(&mdpr->max_packet_size);
+ mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size);
+ mdpr->start_time=BE_32(&mdpr->start_time);
+ mdpr->preroll=BE_32(&mdpr->preroll);
+ mdpr->duration=BE_32(&mdpr->duration);
+ mdpr->object_id=BE_32(&mdpr->object_id);
+
+ return RMFF_MDPRHEADER_SIZE + s1 + s2 + s3;
}
-static void rmff_dump_cont(rmff_cont_t *cont, char *buffer) {
+static int rmff_dump_cont(rmff_cont_t *cont, uint8_t *buffer, int bufsize) {
+
+ int p;
+
+ if (!cont) return 0;
+
+ if (bufsize < RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + \
+ cont->copyright_len + cont->comment_len)
+ return -1;
- int p;
+ cont->object_id=BE_32(&cont->object_id);
+ cont->size=BE_32(&cont->size);
+ cont->object_version=BE_16(&cont->object_version);
- if (!cont) return;
- cont->object_id=BE_32(&cont->object_id);
- cont->size=BE_32(&cont->size);
- cont->object_version=BE_16(&cont->object_version);
+ memcpy(buffer, cont, 8);
+ memcpy(&buffer[8], &cont->object_version, 2);
- memcpy(buffer, cont, 8);
- memcpy(&buffer[8], &cont->object_version, 2);
+ cont->title_len=BE_16(&cont->title_len);
+ memcpy(&buffer[10], &cont->title_len, 2);
+ cont->title_len=BE_16(&cont->title_len);
+ memcpy(&buffer[12], cont->title, cont->title_len);
+ p=12+cont->title_len;
- cont->title_len=BE_16(&cont->title_len);
- memcpy(&buffer[10], &cont->title_len, 2);
- cont->title_len=BE_16(&cont->title_len);
- memcpy(&buffer[12], cont->title, cont->title_len);
- p=12+cont->title_len;
+ cont->author_len=BE_16(&cont->author_len);
+ memcpy(&buffer[p], &cont->author_len, 2);
+ cont->author_len=BE_16(&cont->author_len);
+ memcpy(&buffer[p+2], cont->author, cont->author_len);
+ p+=2+cont->author_len;
- cont->author_len=BE_16(&cont->author_len);
- memcpy(&buffer[p], &cont->author_len, 2);
- cont->author_len=BE_16(&cont->author_len);
- memcpy(&buffer[p+2], cont->author, cont->author_len);
- p+=2+cont->author_len;
+ cont->copyright_len=BE_16(&cont->copyright_len);
+ memcpy(&buffer[p], &cont->copyright_len, 2);
+ cont->copyright_len=BE_16(&cont->copyright_len);
+ memcpy(&buffer[p+2], cont->copyright, cont->copyright_len);
+ p+=2+cont->copyright_len;
- cont->copyright_len=BE_16(&cont->copyright_len);
- memcpy(&buffer[p], &cont->copyright_len, 2);
- cont->copyright_len=BE_16(&cont->copyright_len);
- memcpy(&buffer[p+2], cont->copyright, cont->copyright_len);
- p+=2+cont->copyright_len;
+ cont->comment_len=BE_16(&cont->comment_len);
+ memcpy(&buffer[p], &cont->comment_len, 2);
+ cont->comment_len=BE_16(&cont->comment_len);
+ memcpy(&buffer[p+2], cont->comment, cont->comment_len);
- cont->comment_len=BE_16(&cont->comment_len);
- memcpy(&buffer[p], &cont->comment_len, 2);
- cont->comment_len=BE_16(&cont->comment_len);
- memcpy(&buffer[p+2], cont->comment, cont->comment_len);
+ cont->size=BE_32(&cont->size);
+ cont->object_version=BE_16(&cont->object_version);
+ cont->object_id=BE_32(&cont->object_id);
- cont->size=BE_32(&cont->size);
- cont->object_version=BE_16(&cont->object_version);
- cont->object_id=BE_32(&cont->object_id);
+ return RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + \
+ cont->copyright_len + cont->comment_len;
}
-static void rmff_dump_dataheader(rmff_data_t *data, char *buffer) {
+static int rmff_dump_dataheader(rmff_data_t *data, uint8_t *buffer, int bufsize) {
+
+ if (!data) return 0;
+
+ if (bufsize < RMFF_DATAHEADER_SIZE)
+ return -1;
- if (!data) return;
data->object_id=BE_32(&data->object_id);
data->size=BE_32(&data->size);
data->size=BE_32(&data->size);
data->object_version=BE_16(&data->object_version);
data->object_id=BE_32(&data->object_id);
-}
-int rmff_dump_header(rmff_header_t *h, char *buffer, int max) {
-
- int written=0;
- rmff_mdpr_t **stream=h->streams;
+ return RMFF_DATAHEADER_SIZE;
+}
- rmff_dump_fileheader(h->fileheader, &buffer[written]);
- written+=h->fileheader->size;
- rmff_dump_prop(h->prop, &buffer[written]);
- written+=h->prop->size;
- rmff_dump_cont(h->cont, &buffer[written]);
- written+=h->cont->size;
- if (stream)
- {
- while(*stream)
- {
- rmff_dump_mdpr(*stream, &buffer[written]);
- written+=(*stream)->size;
- stream++;
+int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max) {
+ uint8_t *buffer = buf_gen;
+
+ int written=0, size;
+ rmff_mdpr_t **stream=h->streams;
+
+ if ((size=rmff_dump_fileheader(h->fileheader, &buffer[written], max)) < 0)
+ return -1;
+
+ written += size;
+ max -= size;
+
+ if ((size=rmff_dump_prop(h->prop, &buffer[written], max)) < 0)
+ return -1;
+
+ written += size;
+ max -= size;
+
+ if ((size=rmff_dump_cont(h->cont, &buffer[written], max)) < 0)
+ return -1;
+
+ written += size;
+ max -= size;
+
+ if (stream) {
+ while(*stream) {
+ if ((size=rmff_dump_mdpr(*stream, &buffer[written], max)) < 0)
+ return -1;
+ written += size;
+ max -= size;
+ stream++;
+ }
}
- }
- rmff_dump_dataheader(h->data, &buffer[written]);
- written+=18;
+ if ((size=rmff_dump_dataheader(h->data, &buffer[written], max)) < 0)
+ return -1;
+
+ written+=size;
- return written;
+ return written;
}
void rmff_dump_pheader(rmff_pheader_t *h, char *data) {
rmff_fileheader_t *rmff_new_fileheader(uint32_t num_headers) {
- rmff_fileheader_t *fileheader = malloc(sizeof(rmff_fileheader_t));
- if( !fileheader ) return NULL;
+ rmff_fileheader_t *fileheader = calloc( 1, sizeof(rmff_fileheader_t) );
+ if( !fileheader )
+ return NULL;
- memset(fileheader, 0, sizeof(rmff_fileheader_t));
fileheader->object_id=RMF_TAG;
fileheader->size=18;
fileheader->object_version=0;
uint16_t num_streams,
uint16_t flags ) {
- rmff_prop_t *prop = malloc(sizeof(rmff_prop_t));
- if( !prop ) return NULL;
+ rmff_prop_t *prop = calloc( 1, sizeof(rmff_prop_t) );
+ if( !prop )
+ return NULL;
- memset(prop, 0, sizeof(rmff_prop_t));
prop->object_id=PROP_TAG;
prop->size=50;
prop->object_version=0;
uint32_t type_specific_len,
const char *type_specific_data ) {
- rmff_mdpr_t *mdpr = malloc(sizeof(rmff_mdpr_t));
- if( !mdpr ) return NULL;
+ rmff_mdpr_t *mdpr = calloc( 1, sizeof(rmff_mdpr_t) );
+ if( !mdpr )
+ return NULL;
- memset(mdpr, 0, sizeof(rmff_mdpr_t));
mdpr->object_id=MDPR_TAG;
mdpr->object_version=0;
mdpr->stream_number=stream_number;
}
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);
if( !mdpr->type_specific_data ) {
- if( mdpr->stream_name ) free( mdpr->stream_name );
+ free( mdpr->stream_name );
free( mdpr );
return NULL;
}
rmff_cont_t *rmff_new_cont(const char *title, const char *author, const char *copyright, const char *comment) {
- rmff_cont_t *cont = malloc(sizeof(rmff_cont_t));
- if( !cont ) return NULL;
+ rmff_cont_t *cont = calloc( 1, sizeof(rmff_cont_t) );
+ if( !cont )
+ return NULL;
- memset(cont, 0, sizeof(rmff_cont_t));
cont->object_id=CONT_TAG;
cont->object_version=0;
cont->title=NULL;
}
rmff_data_t *rmff_new_dataheader(uint32_t num_packets, uint32_t next_data_header) {
- rmff_data_t *data = malloc(sizeof(rmff_data_t));
- if( !data ) return NULL;
+ rmff_data_t *data = calloc( 1, sizeof(rmff_data_t) );
+ if( !data )
+ return NULL;
- memset(data, 0, sizeof(rmff_data_t));
data->object_id=DATA_TAG;
data->size=18;
data->object_version=0;
printf("rmff_print_header: NULL given\n");
return;
}
- if(h->fileheader) {
+ if(h->fileheader)
+ {
printf("\nFILE:\n");
printf("file version : %d\n", h->fileheader->file_version);
printf("number of headers : %d\n", h->fileheader->num_headers);
}
- if(h->cont) {
+ if(h->cont)
+ {
printf("\nCONTENT:\n");
printf("title : %s\n", h->cont->title);
printf("author : %s\n", h->cont->author);
printf("copyright : %s\n", h->cont->copyright);
printf("comment : %s\n", h->cont->comment);
}
- if(h->prop) {
+ if(h->prop)
+ {
printf("\nSTREAM PROPERTIES:\n");
printf("bit rate (max/avg) : %i/%i\n", h->prop->max_bit_rate, h->prop->avg_bit_rate);
printf("packet size (max/avg) : %i/%i bytes\n", h->prop->max_packet_size, h->prop->avg_packet_size);
printf("\n");
}
stream=h->streams;
- if(stream) {
- while (*stream) {
+ if(stream)
+ {
+ while (*stream)
+ {
printf("\nSTREAM %i:\n", (*stream)->stream_number);
printf("stream name [mime type] : %s [%s]\n", (*stream)->stream_name, (*stream)->mime_type);
printf("bit rate (max/avg) : %i/%i\n", (*stream)->max_bit_rate, (*stream)->avg_bit_rate);
stream++;
}
}
- if(h->data) {
+ if(h->data)
+ {
printf("\nDATA:\n");
printf("size : %i\n", h->data->size);
printf("packets : %i\n", h->data->num_packets);
}
if (!h->streams) {
lprintf("rmff_fix_header: warning: no MDPR chunks\n");
- } else {
+ } else
+ {
streams=h->streams;
- while (*streams) {
+ while (*streams)
+ {
num_streams++;
num_headers++;
header_size+=(*streams)->size;
}
}
if (h->prop) {
- if (h->prop->size != 50) {
+ if (h->prop->size != 50)
+ {
lprintf("rmff_fix_header: correcting prop.size from %i to %i\n", h->prop->size, 50);
h->prop->size=50;
}
- if (h->prop->num_streams != num_streams) {
+ if (h->prop->num_streams != num_streams)
+ {
lprintf("rmff_fix_header: correcting prop.num_streams from %i to %i\n", h->prop->num_streams, num_streams);
h->prop->num_streams=num_streams;
}
num_headers++;
header_size+=50;
- } else lprintf("rmff_fix_header: warning: no PROP chunk.\n");
+ } else
+ lprintf("rmff_fix_header: warning: no PROP chunk.\n");
if (h->cont) {
num_headers++;
header_size+=h->cont->size;
- } else lprintf("rmff_fix_header: warning: no CONT chunk.\n");
+ } else
+ lprintf("rmff_fix_header: warning: no CONT chunk.\n");
if (!h->data) {
lprintf("rmff_fix_header: no DATA chunk, creating one\n");
- h->data = malloc(sizeof(rmff_data_t));
- if( h->data ) {
- memset(h->data, 0, sizeof(rmff_data_t));
+ h->data = calloc( 1, sizeof(rmff_data_t) );
+ if( h->data )
+ {
h->data->object_id=DATA_TAG;
h->data->object_version=0;
h->data->size=18;
if (!h->fileheader) {
lprintf("rmff_fix_header: no fileheader, creating one");
- h->fileheader = malloc(sizeof(rmff_fileheader_t));
- if( h->fileheader ) {
- memset(h->fileheader, 0, sizeof(rmff_fileheader_t));
+ h->fileheader = calloc( 1, sizeof(rmff_fileheader_t) );
+ if( h->fileheader )
+ {
h->fileheader->object_id=RMF_TAG;
h->fileheader->size=18;
h->fileheader->object_version=0;
{
if (!h) return;
- if (h->fileheader) free(h->fileheader);
- if (h->prop) free(h->prop);
- if (h->data) free(h->data);
- if (h->cont) {
- free(h->cont->title);
- free(h->cont->author);
- free(h->cont->copyright);
- free(h->cont->comment);
- free(h->cont);
+ free( h->fileheader );
+ free( h->prop );
+ free( h->data );
+ if( h->cont ) {
+ free( h->cont->title );
+ free( h->cont->author );
+ free( h->cont->copyright );
+ free( h->cont->comment );
+ free( h->cont );
}
- if (h->streams) {
+ if (h->streams)
+ {
rmff_mdpr_t **s=h->streams;
while(*s) {
projects / vlc / blobdiff