OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2f2321
)
lavfi/fps: remove parse opt error message.
author
Clément Bœsch
<ubitux@gmail.com>
Tue, 11 Dec 2012 17:14:08 +0000
(18:14 +0100)
committer
Clément Bœsch
<ubitux@gmail.com>
Tue, 11 Dec 2012 17:14:08 +0000
(18:14 +0100)
See
cc650cf0
for more info.
libavfilter/vf_fps.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_fps.c
b/libavfilter/vf_fps.c
index
4c8444d
..
d4305e7
100644
(file)
--- a/
libavfilter/vf_fps.c
+++ b/
libavfilter/vf_fps.c
@@
-80,11
+80,8
@@
static av_cold int init(AVFilterContext *ctx, const char *args)
s->class = &fps_class;
av_opt_set_defaults(s);
- if ((ret = av_opt_set_from_string(s, args, shorthand, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing the options string %s.\n",
- args);
+ if ((ret = av_opt_set_from_string(s, args, shorthand, "=", ":")) < 0)
return ret;
- }
if ((ret = av_parse_video_rate(&s->framerate, s->fps)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing framerate %s.\n", s->fps);