Mercurial > libavformat.hg
comparison asf.c @ 1703:30d4f60f2573 libavformat
get rid of some sensless malloc/free
| author | michael |
|---|---|
| date | Mon, 22 Jan 2007 11:03:47 +0000 |
| parents | 18b502ad97f1 |
| children | a162510aeb32 |
comparison
equal
deleted
inserted
replaced
| 1702:18b502ad97f1 | 1703:30d4f60f2573 |
|---|---|
| 337 desc_count = get_le16(pb); | 337 desc_count = get_le16(pb); |
| 338 for(i=0;i<desc_count;i++) | 338 for(i=0;i<desc_count;i++) |
| 339 { | 339 { |
| 340 int name_len,value_type,value_len; | 340 int name_len,value_type,value_len; |
| 341 uint64_t value_num = 0; | 341 uint64_t value_num = 0; |
| 342 char *name; | 342 char name[1024]; |
| 343 | 343 |
| 344 name_len = get_le16(pb); | 344 name_len = get_le16(pb); |
| 345 name = av_malloc(name_len * 2); | 345 get_str16_nolen(pb, name_len, name, sizeof(name)); |
| 346 get_str16_nolen(pb, name_len, name, name_len * 2); | |
| 347 value_type = get_le16(pb); | 346 value_type = get_le16(pb); |
| 348 value_len = get_le16(pb); | 347 value_len = get_le16(pb); |
| 349 if ((value_type == 0) || (value_type == 1)) // unicode or byte | 348 if ((value_type == 0) || (value_type == 1)) // unicode or byte |
| 350 { | 349 { |
| 351 if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album)); | 350 if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album)); |
| 358 if (value_type==4) value_num = get_le64(pb); | 357 if (value_type==4) value_num = get_le64(pb); |
| 359 if (value_type==5) value_num = get_le16(pb); | 358 if (value_type==5) value_num = get_le16(pb); |
| 360 if (strcmp(name,"WM/Track")==0) s->track = value_num + 1; | 359 if (strcmp(name,"WM/Track")==0) s->track = value_num + 1; |
| 361 if (strcmp(name,"WM/TrackNumber")==0) s->track = value_num; | 360 if (strcmp(name,"WM/TrackNumber")==0) s->track = value_num; |
| 362 } | 361 } |
| 363 av_free(name); | |
| 364 } | 362 } |
| 365 } else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) { | 363 } else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) { |
| 366 int ext_len, payload_ext_ct, stream_ct; | 364 int ext_len, payload_ext_ct, stream_ct; |
| 367 uint32_t ext_d; | 365 uint32_t ext_d; |
| 368 int64_t pos_ex_st; | 366 int64_t pos_ex_st; |