aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2012-12-31 15:33:25 +0100
committerJustin Ruggles <justin.ruggles@gmail.com>2013-01-22 16:10:02 -0500
commit1fd2deedcc6400e08b31566a547a5fac3b38cefb (patch)
tree9a5e6ae99f91d82fac3cef7c590d61d10f752978
parent3ffcccb4fbaae4d5ad775506f1f2761f2029affa (diff)
downloadffmpeg-1fd2deedcc6400e08b31566a547a5fac3b38cefb.tar.gz
mlpdec: set the channel layout.
Fixes bug 401. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org
-rw-r--r--libavcodec/mlpdec.c6
1 files changed, 4 insertions, 2 deletions
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;
}