return ac;
}
- in_planar = av_sample_fmt_is_planar(in_fmt);
- out_planar = av_sample_fmt_is_planar(out_fmt);
+ in_planar = ff_sample_fmt_is_planar(in_fmt, channels);
+ out_planar = ff_sample_fmt_is_planar(out_fmt, channels);
if (in_planar == out_planar) {
ac->func_type = CONV_FUNC_TYPE_FLAT;
if (ac->apply_map) {
ChannelMapInfo *map = &ac->avr->ch_map_info;
- if (!av_sample_fmt_is_planar(ac->out_fmt)) {
+ if (!ff_sample_fmt_is_planar(ac->out_fmt, ac->channels)) {
av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
return AVERROR(EINVAL);
}
if (map->do_remap) {
- if (av_sample_fmt_is_planar(ac->in_fmt)) {
+ if (ff_sample_fmt_is_planar(ac->in_fmt, ac->channels)) {
conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
ac->conv_flat;