Mercurial > libavcodec.hg
comparison mlpdec.c @ 9504:dc643c3c285e libavcodec
mlpdec: Make read_matrix_params() take unsigned int substr for consistency.
| author | ramiro |
|---|---|
| date | Sat, 18 Apr 2009 18:54:30 +0000 |
| parents | 1997b5b2a40e |
| children | bcef741a555a |
comparison
equal
deleted
inserted
replaced
| 9503:1997b5b2a40e | 9504:dc643c3c285e |
|---|---|
| 505 return 0; | 505 return 0; |
| 506 } | 506 } |
| 507 | 507 |
| 508 /** Read parameters for primitive matrices. */ | 508 /** Read parameters for primitive matrices. */ |
| 509 | 509 |
| 510 static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *gbp) | 510 static int read_matrix_params(MLPDecodeContext *m, unsigned int substr, GetBitContext *gbp) |
| 511 { | 511 { |
| 512 SubStream *s = &m->substream[substr]; | |
| 512 unsigned int mat, ch; | 513 unsigned int mat, ch; |
| 513 | 514 |
| 514 if (m->matrix_changed++ > 1) { | 515 if (m->matrix_changed++ > 1) { |
| 515 av_log(m->avctx, AV_LOG_ERROR, "Matrices may change only once per access unit.\n"); | 516 av_log(m->avctx, AV_LOG_ERROR, "Matrices may change only once per access unit.\n"); |
| 516 return -1; | 517 return -1; |
| 636 } | 637 } |
| 637 } | 638 } |
| 638 | 639 |
| 639 if (s->param_presence_flags & PARAM_MATRIX) | 640 if (s->param_presence_flags & PARAM_MATRIX) |
| 640 if (get_bits1(gbp)) { | 641 if (get_bits1(gbp)) { |
| 641 if (read_matrix_params(m, s, gbp) < 0) | 642 if (read_matrix_params(m, substr, gbp) < 0) |
| 642 return -1; | 643 return -1; |
| 643 } | 644 } |
| 644 | 645 |
| 645 if (s->param_presence_flags & PARAM_OUTSHIFT) | 646 if (s->param_presence_flags & PARAM_OUTSHIFT) |
| 646 if (get_bits1(gbp)) | 647 if (get_bits1(gbp)) |