RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-04 14:22:12 +00:00
Code Issues Projects Releases Wiki Activity

nutdec: when parsing info packet, set metadata var only once

Browse Source 
Originally committed as revision 25558 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Anton Khirnov 2010-10-24 07:28:04 +00:00
parent a5cea13202
commit c55f891c2f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/nutdec.c
View File

@ -406,6 +406,7 @@ static int decode_info_header(NUTContext *nut){
const char *type;
AVChapter *chapter= NULL;
AVStream *st= NULL;
AVMetadata **metadata = NULL;
end= get_packetheader(nut, bc, 1, INFO_STARTCODE);
end += url_ftell(bc);
@ -421,8 +422,12 @@ static int decode_info_header(NUTContext *nut){
chapter= ff_new_chapter(s, chapter_id,
nut->time_base[chapter_start % nut->time_base_count],
start, start + chapter_len, NULL);
} else if(stream_id_plus1)
metadata = &chapter->metadata;
} else if(stream_id_plus1) {
st= s->streams[stream_id_plus1 - 1];
metadata = &st->metadata;
} else
metadata = &s->metadata;
for(i=0; i<count; i++){
get_str(bc, name, sizeof(name));
@ -453,12 +458,10 @@ static int decode_info_header(NUTContext *nut){
}
if(!strcmp(type, "UTF-8")){
AVMetadata **metadata = NULL;
if(chapter_id==0 && !strcmp(name, "Disposition"))
if(chapter_id==0 && !strcmp(name, "Disposition")) {
set_disposition_bits(s, str_value, stream_id_plus1 - 1);
else if(chapter) metadata= &chapter->metadata;
else if(stream_id_plus1) metadata= &st->metadata;
else metadata= &s->metadata;
continue;
}
if(metadata && strcasecmp(name,"Uses")
&& strcasecmp(name,"Depends") && strcasecmp(name,"Replaces"))
av_metadata_set2(metadata, name, str_value, 0);