diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:12:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:53:39 +0100 |
| commit | 9e3e11a348e047da05415c3e7ea6720be2d78d9f (patch) | |
| tree | 2fa821199170544ea508f19537dad6c1f511c266 | |
| parent | 1d20d975aa899cb5e0e5c9e9c34ce36e4f0faae3 (diff) | |
| download | ffmpeg-9e3e11a348e047da05415c3e7ea6720be2d78d9f.tar.gz | |
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@gmx.at>
| -rw-r--r-- | libavcodec/mlpdec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 8e6f1fc5f3..5032b31bb8 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; |