From af8a273a78310afef52eacb55ce9dd76f42a97f5 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Fri, 16 Dec 2016 16:11:21 -0700 Subject: [PATCH] fixup ffmpeg create filter seperator list, repair track title xml blunder --- cinelerra-5.1/cinelerra/ffmpeg.C | 2 +- cinelerra-5.1/cinelerra/track.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index b5b4a571..2f3d9451 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -2326,7 +2326,7 @@ int FFVideoStream::create_filter(const char *filter_spec, const char *sp = filter_spec; char filter_name[BCSTRLEN], *np = filter_name; int i = sizeof(filter_name); - while( --i>=0 && *sp!=0 && !strchr(" \t:=",*sp) ) *np++ = *sp++; + while( --i>=0 && *sp!=0 && !strchr(" \t:=,",*sp) ) *np++ = *sp++; *np = 0; AVFilter *filter = !filter_name[0] ? 0 : avfilter_get_by_name(filter_name); if( !filter || avfilter_pad_get_type(filter->inputs,0) != AVMEDIA_TYPE_VIDEO ) { diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C index 05bb5036..ae7d1049 100644 --- a/cinelerra-5.1/cinelerra/track.C +++ b/cinelerra-5.1/cinelerra/track.C @@ -339,7 +339,7 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags) else if(file->tag.title_is("TITLE")) { - result = file->skip_tag(); + file->read_text_until("/TITLE", title, BCTEXTLEN); } else if(load_flags && automation->load(file) -- 2.26.2