mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb': mlpdec: set the channel layout. Conflicts: libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1cf6f6f3da
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue