diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 20:36:19 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 20:36:19 +0200 |
| commit | d83dd630a09d310463b525c6471c8d8f47fd20ec (patch) | |
| tree | 9eb33752a16b3b79d22aa05a6fb1790a7e12036e /libavutil/opt.c | |
| parent | 251fb7dcd4865a9821fc238dbcc674e57080c91e (diff) | |
lavu: Drop FF_API_GET_CHANNEL_LAYOUT_COMPAT cruft
FATE refs changed to accomodate for the new default behavior of the function.
Numbers are now interpreted as a channel layout, instead of a number of channels.
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 8d44e1f42a..4030fa8ed5 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -395,11 +395,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) if (!val || !strcmp(val, "none")) { *(int64_t *)dst = 0; } else { -#if FF_API_GET_CHANNEL_LAYOUT_COMPAT - int64_t cl = ff_get_channel_layout(val, 0); -#else int64_t cl = av_get_channel_layout(val); -#endif if (!cl) { av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as channel layout\n", val); ret = AVERROR(EINVAL); |