Commit 16428e63 authored by Michael Niedermayer's avatar Michael Niedermayer

simplify

Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9822564d
...@@ -389,7 +389,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -389,7 +389,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_str16_nolen(pb, name_len, name, sizeof(name)); get_str16_nolen(pb, name_len, name, sizeof(name));
value_type = get_le16(pb); value_type = get_le16(pb);
value_len = get_le16(pb); value_len = get_le16(pb);
if ((value_type == 0) || (value_type == 1)) // unicode or byte if (value_type <= 1) // unicode or byte
{ {
if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album)); if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album));
else if(!strcmp(name,"WM/Genre" )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre)); else if(!strcmp(name,"WM/Genre" )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre));
...@@ -410,7 +410,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -410,7 +410,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
} }
else url_fskip(pb, value_len); else url_fskip(pb, value_len);
} }
if ((value_type >= 2) && (value_type <= 5)) // boolean or DWORD or QWORD or WORD else if (value_type <= 5) // boolean or DWORD or QWORD or WORD
{ {
value_num= get_value(pb, value_type); value_num= get_value(pb, value_type);
if (!strcmp(name,"WM/Track" ) && s->track == 0) s->track = value_num + 1; if (!strcmp(name,"WM/Track" ) && s->track == 0) s->track = value_num + 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment