highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support comments in preset files.

Browse Source 
Originally committed as revision 15366 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-09-18 21:07:11 +00:00
parent 96b52f9e04
commit 8a4f816a6d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -3718,7 +3718,7 @@ static int opt_bsf(const char *opt, const char *arg)
static int opt_preset(const char *opt, const char *arg) static int opt_preset(const char *opt, const char *arg)
{ {
FILE *f=NULL; FILE *f=NULL;
char tmp[1000], tmp2[1000]; char tmp[1000], tmp2[1000], line[1000];
int i; int i;
const char *base[3]= { getenv("HOME"), const char *base[3]= { getenv("HOME"),
"/usr/local/share", "/usr/local/share",
@ -3743,8 +3743,11 @@ static int opt_preset(const char *opt, const char *arg)
} }
while(!feof(f)){ while(!feof(f)){
int e= fscanf(f, "%999[^=]=%999[^\n]\n", tmp, tmp2); int e= fscanf(f, "%999[^\n]\n", line) - 1;
if(e!=2){ if(line[0] == '#' && !e)
continue;
e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
if(e){
fprintf(stderr, "Preset file invalid\n"); fprintf(stderr, "Preset file invalid\n");
av_exit(1); av_exit(1);
} }