Browse Source

Merge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4

* commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47':
  af_resample: check av_opt_set_dict return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
commit
b400412443
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavfilter/af_resample.c

+ 4
- 1
libavfilter/af_resample.c View File

@@ -135,11 +135,14 @@ static int config_output(AVFilterLink *outlink)
return AVERROR(ENOMEM);

if (s->options) {
int ret;
AVDictionaryEntry *e = NULL;
while ((e = av_dict_get(s->options, "", e, AV_DICT_IGNORE_SUFFIX)))
av_log(ctx, AV_LOG_VERBOSE, "lavr option: %s=%s\n", e->key, e->value);

av_opt_set_dict(s->avr, &s->options);
ret = av_opt_set_dict(s->avr, &s->options);
if (ret < 0)
return ret;
}

av_opt_set_int(s->avr, "in_channel_layout", inlink ->channel_layout, 0);


Loading…
Cancel
Save