diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:26:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:26:36 +0100 |
| commit | fd37a7dc3c1bc09e9f2367dc8487dd5cce9cf291 (patch) | |
| tree | 85304419ac1351aea15f06af44e326a9a28de184 /libavutil/opt.c | |
| parent | e63ebaca16b7620441dda9e21b8773ef7e7ae2df (diff) | |
| parent | cf53704c55378cc0dcfc16637cdac7d58f0b3107 (diff) | |
| download | ffmpeg-fd37a7dc3c1bc09e9f2367dc8487dd5cce9cf291.tar.gz | |
Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'
* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
AVOptions: make av_set_options_string() forward options to child objects
win32: Use 64-bit fstat/lseek variants for MSVC as well
win32: Make ff_win32_open more robust
Conflicts:
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index a2cdcb4a17..97fc6fd9b5 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1040,7 +1040,7 @@ static int parse_key_value_pair(void *ctx, const char **buf, av_log(ctx, AV_LOG_DEBUG, "Setting entry with key '%s' to value '%s'\n", key, val); - ret = av_opt_set(ctx, key, val, 0); + ret = av_opt_set(ctx, key, val, AV_OPT_SEARCH_CHILDREN); if (ret == AVERROR_OPTION_NOT_FOUND) av_log(ctx, AV_LOG_ERROR, "Key '%s' not found.\n", key); |