Finishes fixing vp5/potter512-400-partial.avi The fate-matroska-ms-mode test ref is updated to reflect that the Speex decoder can now read the stream.
Unified · Split
| @@ -1420,9 +1420,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, · 1419 unmodified lines | |||
| 1420 | if (s->nb_channels <= 0 || s->nb_channels > 2) | 1420 | if (s->nb_channels <= 0 || s->nb_channels > 2) |
| 1421 | return AVERROR_INVALIDDATA; | 1421 | return AVERROR_INVALIDDATA; |
| 1422 | s->bitrate = bytestream_get_le32(&buf); | 1422 | s->bitrate = bytestream_get_le32(&buf); |
| 1423 | s->frame_size = bytestream_get_le32(&buf); | 1423 | s->frame_size = (1 + (s->mode > 0)) * bytestream_get_le32(&buf); |
| 1424 | if (s->frame_size < NB_FRAME_SIZE << s->mode) | ||
| 1425 | return AVERROR_INVALIDDATA; | ||
| 1426 | s->vbr = bytestream_get_le32(&buf); | 1424 | s->vbr = bytestream_get_le32(&buf); |
| 1427 | s->frames_per_packet = bytestream_get_le32(&buf); | 1425 | s->frames_per_packet = bytestream_get_le32(&buf); |
| 1428 | if (s->frames_per_packet <= 0 || | 1426 | if (s->frames_per_packet <= 0 || |
| @@ -1,4 +1,4 @@ | |||
| 1 | a2897e3951b0054d0fa31fe51860444f *tests/data/fate/matroska-ms-mode.matroska | 1 | e7f44cd6a5c0f45fea11874afb8c1c0d *tests/data/fate/matroska-ms-mode.matroska |
| 2 | 413103 tests/data/fate/matroska-ms-mode.matroska | 2 | 413103 tests/data/fate/matroska-ms-mode.matroska |
| 3 | #extradata 0: 40, 0x54290c93 | 3 | #extradata 0: 40, 0x54290c93 |
| 4 | #extradata 1: 114, 0xb6c80771 | 4 | #extradata 1: 114, 0xb6c80771 |