aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-10-18 18:42:20 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2008-10-18 18:42:20 +0000
commit70899705ee73c898e04973a7e1dcb35832f79c07 (patch)
tree144530f4039a09a3f6f69071f39fd9726295f8bd
parentb73533176b75c7874cdb02dee4eae96080a70928 (diff)
downloadffmpeg-70899705ee73c898e04973a7e1dcb35832f79c07.tar.gz
Provide more context to the opt_preset() error messages, printing the
name of the preset file where the error occurred. Originally committed as revision 15637 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c94ca31fdd..3541f9e89e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3667,7 +3667,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], line[1000];
+ char filename[1000], tmp[1000], tmp2[1000], line[1000];
int i;
const char *base[3]= { getenv("HOME"),
"/usr/local/share",
@@ -3675,19 +3675,20 @@ static int opt_preset(const char *opt, const char *arg)
};
for(i=!base[0]; i<3 && !f; i++){
- snprintf(tmp, sizeof(tmp), "%s/%sffmpeg/%s.ffpreset", base[i], i ? "" : ".", arg);
- f= fopen(tmp, "r");
+ snprintf(filename, sizeof(filename), "%s/%sffmpeg/%s.ffpreset", base[i], i ? "" : ".", arg);
+ f= fopen(filename, "r");
if(!f){
char *codec_name= *opt == 'v' ? video_codec_name :
*opt == 'a' ? audio_codec_name :
subtitle_codec_name;
- snprintf(tmp, sizeof(tmp), "%s/%sffmpeg/%s-%s.ffpreset", base[i], i ? "" : ".", codec_name, arg);
- f= fopen(tmp, "r");
+ snprintf(filename, sizeof(filename), "%s/%sffmpeg/%s-%s.ffpreset", base[i], i ? "" : ".", codec_name, arg);
+ f= fopen(filename, "r");
}
}
if(!f && ((arg[0]=='.' && arg[1]=='/') || arg[0]=='/' ||
is_dos_path(arg))){
- f= fopen(arg, "r");
+ snprintf(filename, sizeof(filename), arg);
+ f= fopen(filename, "r");
}
if(!f){
@@ -3701,7 +3702,7 @@ static int opt_preset(const char *opt, const char *arg)
continue;
e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
if(e){
- fprintf(stderr, "Preset file invalid\n");
+ fprintf(stderr, "%s: Preset file invalid\n", filename);
av_exit(1);
}
if(!strcmp(tmp, "acodec")){
@@ -3711,7 +3712,7 @@ static int opt_preset(const char *opt, const char *arg)
}else if(!strcmp(tmp, "scodec")){
opt_subtitle_codec(tmp2);
}else if(opt_default(tmp, tmp2) < 0){
- fprintf(stderr, "Invalid option or argument: %s=%s\n", tmp, tmp2);
+ fprintf(stderr, "%s: Invalid option or argument: %s=%s\n", filename, tmp, tmp2);
av_exit(1);
}
}