lavc/mlpdec: reset layout when channels change.

Triggered by the sample for trac ticket #1726.

lavc/mlpdec: reset layout when channels change.
Triggered by the sample for trac ticket #1726.
e6701d51 · Nicolas George · 3fd60d80 · e6701d51
Commit e6701d51 authored Nov 28, 2012 by Nicolas George
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

mlpdec.c libavcodec/mlpdec.c +4 -1

No files found.
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -524,8 +524,11 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
        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->channel_layout = 0;
+    }

    return 0;
 }