har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/mlpdec: reset layout when channels change.

Browse Source 
Triggered by the sample for trac ticket #1726.
This commit is contained in:
Nicolas George 2012-11-28 15:25:39 +01:00
parent 3fd60d8049
commit e6701d51e1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mlpdec.c
View File

@ -524,8 +524,11 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
cp->huff_lsbs = 24; cp->huff_lsbs = 24;
} }
if (substr == m->max_decoded_substream) if (substr == m->max_decoded_substream &&
m->avctx->channels != s->max_matrix_channel + 1) {
m->avctx->channels = s->max_matrix_channel + 1; m->avctx->channels = s->max_matrix_channel + 1;
m->avctx->channel_layout = 0;
}
return 0; return 0;
} }