Mercurial > libavformat.hg
diff asf.c @ 3115:924d2cb02fd1 libavformat
simplify
| author | michael |
|---|---|
| date | Thu, 06 Mar 2008 00:20:49 +0000 |
| parents | 532809e27981 |
| children | 62255978fe94 |
line wrap: on
line diff
--- a/asf.c Wed Mar 05 15:29:10 2008 +0000 +++ b/asf.c Thu Mar 06 00:20:49 2008 +0000 @@ -389,7 +389,7 @@ get_str16_nolen(pb, name_len, name, sizeof(name)); value_type = 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)); else if(!strcmp(name,"WM/Genre" )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre)); @@ -410,7 +410,7 @@ } 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); if (!strcmp(name,"WM/Track" ) && s->track == 0) s->track = value_num + 1;