summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-16 21:40:29 +0200
committerwm4 <wm4@nowhere>2015-06-16 21:40:29 +0200
commit8ee9c170bec573e7c703d6902d0478f49d987b3e (patch)
treedd06f476e02d425da5525c3b059b32fa40af67bc /audio
parent831d7c3c400b554484561bf912c1f9657f8192cd (diff)
downloadmpv-8ee9c170bec573e7c703d6902d0478f49d987b3e.tar.bz2
mpv-8ee9c170bec573e7c703d6902d0478f49d987b3e.tar.xz
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.
Diffstat (limited to 'audio')
-rw-r--r--audio/filter/af_lavrresample.c2
1 files changed, 1 insertions, 1 deletions
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);