fixup ffmpeg create filter seperator list, repair track title xml blunder
authorGood Guy <[email protected]>
Fri, 16 Dec 2016 23:11:21 +0000 (16:11 -0700)
committerGood Guy <[email protected]>
Fri, 16 Dec 2016 23:11:21 +0000 (16:11 -0700)
cinelerra-5.1/cinelerra/ffmpeg.C
cinelerra-5.1/cinelerra/track.C

index b5b4a57116ed3de19628b2b6fb02805476071391..2f3d945162f7c8dfb966e0b5b317677d80ba6809 100644 (file)
@@ -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 ) {
index 05bb50365446eeaddbda67a3b00b8273ac6a4445..ae7d10491daa4149a71f7221b278d13b625e4b94 100644 (file)
@@ -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)