RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify 

Originally committed as revision 7643 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-22 11:01:27 +00:00
parent 6bb2a2dfb9
commit 916bb12c90
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/asf.c
View File

@ -339,7 +339,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
int name_len,value_type,value_len; int name_len,value_type,value_len;
uint64_t value_num = 0; uint64_t value_num = 0;
char *name, *value; char *name;
name_len = get_le16(pb); name_len = get_le16(pb);
name = av_malloc(name_len * 2); name = av_malloc(name_len * 2);
@ -348,12 +348,8 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
value_len = get_le16(pb); value_len = get_le16(pb);
if ((value_type == 0) || (value_type == 1)) // unicode or byte if ((value_type == 0) || (value_type == 1)) // unicode or byte
{ {
value = av_malloc(value_len * 2); if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album));
get_str16_nolen(pb, value_len, value, if (!strcmp(name,"WM/Genre" )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre));
value_len * 2);
if (strcmp(name,"WM/AlbumTitle")==0) { pstrcpy(s->album, sizeof(s->album), value); }
if (strcmp(name,"WM/Genre")==0) { pstrcpy(s->genre, sizeof(s->genre), value); }
av_free(value);
} }
if ((value_type >= 2) && (value_type <= 5)) // boolean or DWORD or QWORD or WORD if ((value_type >= 2) && (value_type <= 5)) // boolean or DWORD or QWORD or WORD
{ {