From: Tim Walker Date: Mon, 31 Dec 2012 14:33:25 +0000 (+0100) Subject: mlpdec: set the channel layout. X-Git-Tag: n1.2~21^2~365 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=1fd2deedcc6400e08b31566a547a5fac3b38cefb;ds=inline mlpdec: set the channel layout. Fixes bug 401. Signed-off-by: Justin Ruggles CC:libav-stable@libav.org --- diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index f8c647a389..80ff4017f7 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -520,8 +520,10 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, cp->huff_lsbs = 24; } - if (substr == m->max_decoded_substream) - m->avctx->channels = s->max_matrix_channel + 1; + if (substr == m->max_decoded_substream) { + m->avctx->channels = s->max_matrix_channel + 1; + m->avctx->channel_layout = s->ch_layout; + } return 0; }