History

avfilter: fix handing of child context options

Michael Niedermayer committed 13 years ago

Commit f6bfeef1 parent c1907bd1 file · +2 −0Browse files

Unified · Split

libavfilter/avfilter.c+2−0
@@ -656,11 +656,13 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, · 655 unmodified lines
656 av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value);656 av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value);
657 av_dict_set(options, key, value, 0);657 av_dict_set(options, key, value, 0);
658 if ((ret = av_opt_set(ctx->priv, key, value, 0)) < 0) {658 if ((ret = av_opt_set(ctx->priv, key, value, 0)) < 0) {
659 if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) {
659 if (ret == AVERROR_OPTION_NOT_FOUND)660 if (ret == AVERROR_OPTION_NOT_FOUND)
660 av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key);661 av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key);
661 av_free(value);662 av_free(value);
662 av_free(parsed_key);663 av_free(parsed_key);
663 return ret;664 return ret;
665 }
664 }666 }
665 667
666 av_free(value);668 av_free(value);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t