|
|
@ -345,13 +345,13 @@ int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in) |
|
|
|
if (ac->apply_map) { |
|
|
|
if (ac->apply_map) { |
|
|
|
ChannelMapInfo *map = &ac->avr->ch_map_info; |
|
|
|
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"); |
|
|
|
av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n"); |
|
|
|
return AVERROR(EINVAL); |
|
|
|
return AVERROR(EINVAL); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (map->do_remap) { |
|
|
|
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 : |
|
|
|
conv_func_flat *convert = use_generic ? ac->conv_flat_generic : |
|
|
|
ac->conv_flat; |
|
|
|
ac->conv_flat; |
|
|
|
|
|
|
|
|
|
|
|