[FFmpeg-cvslog] mlpdec: set the channel layout.

Tim Walker git at videolan.org
Thu Feb 14 12:18:51 CET 2013


ffmpeg | branch: release/1.1 | Tim Walker <tdskywalker at gmail.com> | Mon Dec 31 15:33:25 2012 +0100| [5393a5600ddb870b3d7cbd427cdd82b2f583b265] | committer: Reinhard Tartler

mlpdec: set the channel layout.

Fixes bug 401.

Signed-off-by: Justin Ruggles <justin.ruggles at gmail.com>

CC:libav-stable at libav.org
(cherry picked from commit 1fd2deedcc6400e08b31566a547a5fac3b38cefb)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5393a5600ddb870b3d7cbd427cdd82b2f583b265
---

 libavcodec/mlpdec.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 3852f6e..8e3a510 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -463,8 +463,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;
 }



More information about the ffmpeg-cvslog mailing list