mirror of https://github.com/mpv-player/mpv
af_lavrresample: always fill reorder
If the code path for additional output conversion is active, reorder_planes() is always called, even if the reorder_out array wasn't filled. This is obviously wrong - always fill this array.
This commit is contained in:
parent
831d7c3c40
commit
8ee9c170be
|
@ -267,8 +267,8 @@ static int configure_lavrr(struct af_instance *af, struct mp_audio *in,
|
||||||
mp_chmap_fill_na(&withna, map_out.num);
|
mp_chmap_fill_na(&withna, map_out.num);
|
||||||
if (withna.num != map_out.num)
|
if (withna.num != map_out.num)
|
||||||
return AF_ERROR;
|
return AF_ERROR;
|
||||||
mp_chmap_get_reorder(s->reorder_out, &out_lavc, &map_out);
|
|
||||||
}
|
}
|
||||||
|
mp_chmap_get_reorder(s->reorder_out, &out_lavc, &map_out);
|
||||||
|
|
||||||
s->avrctx_fmt = *out;
|
s->avrctx_fmt = *out;
|
||||||
mp_audio_set_channels(&s->avrctx_fmt, &out_lavc);
|
mp_audio_set_channels(&s->avrctx_fmt, &out_lavc);
|
||||||
|
|
Loading…
Reference in New Issue