X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Ffileffmpeg.C;fp=cinelerra-5.0%2Fcinelerra%2Ffileffmpeg.C;h=12b8b839e520936231e938c3fb0f53443c352edf;hb=c58bbe01c3c09edf315f78508e61e8924bf44eb0;hp=fdcf3297e6230916ec19b7810b6c10ca3125e516;hpb=328cb789bec2048b23fc731cf4eae860dbacd2b6;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/fileffmpeg.C b/cinelerra-5.0/cinelerra/fileffmpeg.C index fdcf3297..12b8b839 100644 --- a/cinelerra-5.0/cinelerra/fileffmpeg.C +++ b/cinelerra-5.0/cinelerra/fileffmpeg.C @@ -350,16 +350,15 @@ void FFMPEGConfigAudio::create_objects() FileSystem fs; char option_path[BCTEXTLEN]; - FFMPEG::set_option_path(option_path, "/audio"); + FFMPEG::set_option_path(option_path, "audio"); fs.update(option_path); int total_files = fs.total_files(); for(int i = 0; i < total_files; i++) { const char *name = fs.get_entry(i)->get_name(); if( asset->fformat[0] != 0 ) { const char *ext = strrchr(name,'.'); - if( !ext ) ext = name; - else if( !strcmp("opts", ++ext) ) continue; - if( strcmp(asset->fformat, ext) ) continue; + if( !ext ) continue; + if( strcmp(asset->fformat, ++ext) ) continue; } presets.append(new BC_ListBoxItem(name)); } @@ -494,9 +493,8 @@ void FFMPEGConfigVideo::create_objects() const char *name = fs.get_entry(i)->get_name(); if( asset->fformat[0] != 0 ) { const char *ext = strrchr(name,'.'); - if( !ext ) ext = name; - else if( !strcmp("opts", ++ext) ) continue; - if( strcmp(asset->fformat, ext) ) continue; + if( !ext ) continue; + if( strcmp(asset->fformat, ++ext) ) continue; } presets.append(new BC_ListBoxItem(name)); }