diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 22:01:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 22:04:36 +0200 |
| commit | 733db64ce0c66214d7461fe0fdac097cd3c38a16 (patch) | |
| tree | 796e50be01508bb9bc16361c680075e2c6399b4f | |
| parent | 3a4c22f8067fc4e9005e7dc781dff541abca472a (diff) | |
| parent | 0d989dbfc4bc5bc1d563e967449116a7a9865258 (diff) | |
| download | ffmpeg-733db64ce0c66214d7461fe0fdac097cd3c38a16.tar.gz | |
Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'
* commit '0d989dbfc4bc5bc1d563e967449116a7a9865258':
af_resample: check av_opt_set_dict return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_resample.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index f4b396a452..d65d4bc64a 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -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); |