From d83dd630a09d310463b525c6471c8d8f47fd20ec Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sat, 5 Sep 2015 20:36:19 +0200 Subject: 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. --- libavutil/opt.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libavutil/opt.c') 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); -- cgit v1.2.3