[FFmpeg-cvslog] Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
Michael Niedermayer
git at videolan.org
Thu Feb 14 12:18:52 CET 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 16:12:05 2013 +0100| [9e3e11a348e047da05415c3e7ea6720be2d78d9f] | committer: Michael Niedermayer
Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
mlpdec: set the channel layout.
Conflicts:
libavcodec/mlpdec.c
(cherry picked from commit 1cf6f6f3daa9d9ae54a4bf0267b510e1638e272b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e3e11a348e047da05415c3e7ea6720be2d78d9f
---
libavcodec/mlpdec.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 8e6f1fc..5032b31 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -578,10 +578,9 @@ 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) {
- m->avctx->channels = s->max_matrix_channel + 1;
- m->avctx->channel_layout = 0;
+ 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