Module: libav Branch: master Commit: 11db644a8e54f02e54d2eaad343a87fcb697c15e
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Sun Aug 17 13:28:03 2014 +0000 lavr: Update the planar check in ff_audio_convert Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd. Signed-off-by: Luca Barbato <[email protected]> --- libavresample/audio_convert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c index 11bbbbe..ef23912 100644 --- a/libavresample/audio_convert.c +++ b/libavresample/audio_convert.c @@ -345,13 +345,13 @@ int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in) 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; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
