Mercurial > libavformat.hg

changeset 1702:18b502ad97f1 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author michael
date Mon, 22 Jan 2007 11:01:27 +0000
parents 90be497b752b
children 30d4f60f2573
files asf.c
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/asf.c	Mon Jan 22 10:53:57 2007 +0000
+++ b/asf.c	Mon Jan 22 11:01:27 2007 +0000
@@ -339,7 +339,7 @@
                 {
                         int name_len,value_type,value_len;
                         uint64_t value_num = 0;
-                        char *name, *value;
+                        char *name;
 
                         name_len = get_le16(pb);
                         name = av_malloc(name_len * 2);
@@ -348,12 +348,8 @@
                         value_len = get_le16(pb);
                         if ((value_type == 0) || (value_type == 1)) // unicode or byte
                         {
-                                value = av_malloc(value_len * 2);
-                                get_str16_nolen(pb, value_len, value,
-                                        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 (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album));
+                                if (!strcmp(name,"WM/Genre"     )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre));
                         }
                         if ((value_type >= 2) && (value_type <= 5)) // boolean or DWORD or QWORD or WORD
                         {