From 95c14b1eea17d6322c10fa97de1d05bbbed1e23d Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Sat, 18 Apr 2009 18:54:30 +0000
Subject: [PATCH] mlpdec: Make read_matrix_params() take unsigned int substr
for consistency.
Originally committed as revision 18611 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mlpdec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 596e0a2c79c..a86ad3f15e7 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -507,8 +507,9 @@ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp,
/** Read parameters for primitive matrices. */
-static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *gbp)
+static int read_matrix_params(MLPDecodeContext *m, unsigned int substr, GetBitContext *gbp)
{
+ SubStream *s = &m->substream[substr];
unsigned int mat, ch;
if (m->matrix_changed++ > 1) {
@@ -638,7 +639,7 @@ static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp,
if (s->param_presence_flags & PARAM_MATRIX)
if (get_bits1(gbp)) {
- if (read_matrix_params(m, s, gbp) < 0)
+ if (read_matrix_params(m, substr, gbp) < 0)
return -1;
}
--
GitLab