Commit 9f72ac92 authored by michael's avatar michael

Support comments in preset files.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15366 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 72ba36eb
......@@ -3718,7 +3718,7 @@ static int opt_bsf(const char *opt, const char *arg)
static int opt_preset(const char *opt, const char *arg)
{
FILE *f=NULL;
char tmp[1000], tmp2[1000];
char tmp[1000], tmp2[1000], line[1000];
int i;
const char *base[3]= { getenv("HOME"),
"/usr/local/share",
......@@ -3743,8 +3743,11 @@ static int opt_preset(const char *opt, const char *arg)
}
while(!feof(f)){
int e= fscanf(f, "%999[^=]=%999[^\n]\n", tmp, tmp2);
if(e!=2){
int e= fscanf(f, "%999[^\n]\n", line) - 1;
if(line[0] == '#' && !e)
continue;
e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
if(e){
fprintf(stderr, "Preset file invalid\n");
av_exit(1);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment