From 8ee9c170bec573e7c703d6902d0478f49d987b3e Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 16 Jun 2015 21:40:29 +0200 Subject: 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. --- audio/filter/af_lavrresample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 4683025a7e..77e2dde50e 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -267,8 +267,8 @@ static int configure_lavrr(struct af_instance *af, struct mp_audio *in, mp_chmap_fill_na(&withna, map_out.num); if (withna.num != map_out.num) 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; mp_audio_set_channels(&s->avrctx_fmt, &out_lavc); -- cgit v1.2.3