Mercurial > libavcodec.hg
comparison mlpdec.c @ 9287:b00fc746bdf4 libavcodec
mlpdec: Simplify no restart header seen error.
| author | ramiro |
|---|---|
| date | Mon, 30 Mar 2009 03:44:20 +0000 |
| parents | e02f401dde04 |
| children | 37313693196a |
comparison
equal
deleted
inserted
replaced
| 9286:e02f401dde04 | 9287:b00fc746bdf4 |
|---|---|
| 995 goto next_substr; | 995 goto next_substr; |
| 996 s->restart_seen = 1; | 996 s->restart_seen = 1; |
| 997 } | 997 } |
| 998 | 998 |
| 999 if (!s->restart_seen) { | 999 if (!s->restart_seen) { |
| 1000 av_log(m->avctx, AV_LOG_ERROR, | |
| 1001 "No restart header present in substream %d.\n", | |
| 1002 substr); | |
| 1003 goto next_substr; | 1000 goto next_substr; |
| 1004 } | 1001 } |
| 1005 | 1002 |
| 1006 if (read_decoding_params(m, &gb, substr) < 0) | 1003 if (read_decoding_params(m, &gb, substr) < 0) |
| 1007 goto next_substr; | 1004 goto next_substr; |
| 1008 } | 1005 } |
| 1009 | 1006 |
| 1010 if (!s->restart_seen) { | 1007 if (!s->restart_seen) { |
| 1011 av_log(m->avctx, AV_LOG_ERROR, | |
| 1012 "No restart header present in substream %d.\n", | |
| 1013 substr); | |
| 1014 goto next_substr; | 1008 goto next_substr; |
| 1015 } | 1009 } |
| 1016 | 1010 |
| 1017 if (read_block_data(m, &gb, substr) < 0) | 1011 if (read_block_data(m, &gb, substr) < 0) |
| 1018 return -1; | 1012 return -1; |
| 1053 if (substream_data_len[substr] * 8 != get_bits_count(&gb)) { | 1047 if (substream_data_len[substr] * 8 != get_bits_count(&gb)) { |
| 1054 goto substream_length_mismatch; | 1048 goto substream_length_mismatch; |
| 1055 } | 1049 } |
| 1056 | 1050 |
| 1057 next_substr: | 1051 next_substr: |
| 1052 if (!s->restart_seen) { | |
| 1053 av_log(m->avctx, AV_LOG_ERROR, | |
| 1054 "No restart header present in substream %d.\n", substr); | |
| 1055 } | |
| 1056 | |
| 1058 buf += substream_data_len[substr]; | 1057 buf += substream_data_len[substr]; |
| 1059 } | 1058 } |
| 1060 | 1059 |
| 1061 rematrix_channels(m, m->max_decoded_substream); | 1060 rematrix_channels(m, m->max_decoded_substream); |
| 1062 | 1061 |