diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-10-05 20:18:16 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-10-05 20:18:16 +0000 |
commit | 1fe4abf3975a0841e2820bc137d3ec72c26a6c8e (patch) | |
tree | 8bff49f4d80e2819704842096b718d5dec97100b /libavcodec | |
parent | 41770abf86419f91c4f7a59923b349efaf05a2a2 (diff) | |
download | ffmpeg-1fe4abf3975a0841e2820bc137d3ec72c26a6c8e.tar.gz |
Revert:
r18826 | stefano | 2009-05-14 20:50:58 +0200 (Thu, 14 May 2009) | 2 lines
Make av_set_string3() print a message in case of unknown option.
This change led to multiple identical error messages to be printed if an option
was not found.
Originally committed as revision 20172 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/opt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/opt.c b/libavcodec/opt.c index c7218296f6..a6abcfc2e7 100644 --- a/libavcodec/opt.c +++ b/libavcodec/opt.c @@ -112,10 +112,8 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons const AVOption *o= av_find_opt(obj, name, NULL, 0, 0); if (o_out) *o_out = o; - if(!o) { - av_log(obj, AV_LOG_ERROR, "Unknown option '%s'\n", name); + if(!o) return AVERROR(ENOENT); - } if(!val || o->offset<=0) return AVERROR(EINVAL); |