Browse Source

lavr: Update the planar check in ff_audio_convert

Leftover from fbc0b86599.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
tags/n2.4
Luca Barbato 10 years ago
parent
commit
11db644a8e
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavresample/audio_convert.c

+ 2
- 2
libavresample/audio_convert.c View File

@@ -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;



Loading…
Cancel
Save