generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aiffdec:Rewrite get_meta()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-05-06 17:39:31 +02:00
parent 423986fc09
commit a565c7b7f2
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/aiffdec.c
View File

@@ -68,19 +68,20 @@ static int get_tag(AVIOContext *pb, uint32_t * tag)
static void get_meta(AVFormatContext *s, const char *key, int size) static void get_meta(AVFormatContext *s, const char *key, int size)
{ {
uint8_t *str = av_malloc(size+1); uint8_t *str = av_malloc(size+1);
int res;
if (!str) { if (str) {
avio_skip(s->pb, size); int res = avio_read(s->pb, str, size);
return; if (res < 0){
} av_free(str);
return;
}
size += (size&1)-res;
str[res] = 0;
av_metadata_set2(&s->metadata, key, str, AV_METADATA_DONT_STRDUP_VAL);
}else
size+= size&1;
res = avio_read(s->pb, str, size); avio_skip(s->pb, size);
if (res < 0)
return;
str[res] = 0;
av_metadata_set2(&s->metadata, key, str, AV_METADATA_DONT_STRDUP_VAL);
} }
/* Returns the number of sound data frames or negative on error */ /* Returns the number of sound data frames or negative on error */