diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:12:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:12:05 +0100 |
| commit | 1cf6f6f3daa9d9ae54a4bf0267b510e1638e272b (patch) | |
| tree | 37dbff48388db7748fb6e12294ba6cb57b8d4130 | |
| parent | cd6a8618b1f57a37e6bc639651fe5a657663409b (diff) | |
| parent | 1fd2deedcc6400e08b31566a547a5fac3b38cefb (diff) | |
| download | ffmpeg-1cf6f6f3daa9d9ae54a4bf0267b510e1638e272b.tar.gz | |
Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
mlpdec: set the channel layout.
Conflicts:
libavcodec/mlpdec.c
Merged-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; |