RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-18 05:07:18 +00:00
Code Issues Releases Wiki Activity

demux_mkv: there can be 256 laces

Browse Source 
The lace number is stored with an offset of 1, so the maximum number
of laces is 255+1=256.
This commit is contained in:
wm4 2013-04-13 18:16:50 +02:00
parent 6ef855069f
commit 4b562bdf20
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
demux/demux_mkv.c
View File

@ -1795,11 +1795,11 @@ static bool bstr_read_u8(bstr *buffer, uint8_t *out_u8)
} }
} }
static int demux_mkv_read_block_lacing(bstr *buffer, uint8_t *laces, static int demux_mkv_read_block_lacing(bstr *buffer, int *laces,
uint32_t lace_size[MAX_NUM_LACES]) uint32_t lace_size[MAX_NUM_LACES])
{ {
uint32_t total = 0; uint32_t total = 0;
uint8_t flags; uint8_t flags, t;
int i; int i;
/* lacing flags */ /* lacing flags */
@ -1815,14 +1815,13 @@ static int demux_mkv_read_block_lacing(bstr *buffer, uint8_t *laces,
case 1: /* xiph lacing */ case 1: /* xiph lacing */
case 2: /* fixed-size lacing */ case 2: /* fixed-size lacing */
case 3: /* EBML lacing */ case 3: /* EBML lacing */
if (!bstr_read_u8(buffer, laces)) if (!bstr_read_u8(buffer, &t))
goto error; goto error;
(*laces)++; *laces = t + 1;
switch ((flags & 0x06) >> 1) { switch ((flags & 0x06) >> 1) {
case 1: /* xiph lacing */ case 1: /* xiph lacing */
for (i = 0; i < *laces - 1; i++) { for (i = 0; i < *laces - 1; i++) {
uint8_t t;
lace_size[i] = 0; lace_size[i] = 0;
do { do {
if (!bstr_read_u8(buffer, &t)) if (!bstr_read_u8(buffer, &t))
@ -2134,7 +2133,7 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info)
{ {
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
demux_stream_t *ds = NULL; demux_stream_t *ds = NULL;
uint8_t laces; int laces;
int i, use_this_block = 1; int i, use_this_block = 1;
double current_pts; double current_pts;
bstr data = block_info->data; bstr data = block_info->data;