OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ac1c88
)
Make ffmpeg abort if a preset file contains an invalid option or
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sat, 18 Oct 2008 18:27:32 +0000
(18:27 +0000)
committer
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sat, 18 Oct 2008 18:27:32 +0000
(18:27 +0000)
argument.
Originally committed as revision 15636 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
d8a3d50
..
c94ca31
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-3710,8
+3710,10
@@
static int opt_preset(const char *opt, const char *arg)
opt_video_codec(tmp2);
}else if(!strcmp(tmp, "scodec")){
opt_subtitle_codec(tmp2);
- }else
- opt_default(tmp, tmp2);
+ }else if(opt_default(tmp, tmp2) < 0){
+ fprintf(stderr, "Invalid option or argument: %s=%s\n", tmp, tmp2);
+ av_exit(1);
+ }
}
fclose(f);