RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 14:20:55 +00:00
Code Issues Releases Wiki Activity

demux_mkv: get rid of the duplicated lace case labels

Browse Source 
Also change the extracting of the lace type bitfield from flags to
make it more apparent that the value range is 0-3.
This commit is contained in:
wm4 2013-04-13 18:44:11 +02:00
parent 4b562bdf20
commit 1d6558d9c8
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demux/demux_mkv.c
View File

@ -1806,20 +1806,16 @@ static int demux_mkv_read_block_lacing(bstr *buffer, int *laces,
if (!bstr_read_u8(buffer, &flags))
goto error;
switch ((flags & 0x06) >> 1) {
case 0: /* no lacing */
int type = (flags >> 1) & 0x03;
if (type == 0) { /* no lacing */
*laces = 1;
lace_size[0] = buffer->len;
break;
case 1: /* xiph lacing */
case 2: /* fixed-size lacing */
case 3: /* EBML lacing */
} else {
if (!bstr_read_u8(buffer, &t))
goto error;
*laces = t + 1;
switch ((flags & 0x06) >> 1) {
switch (type) {
case 1: /* xiph lacing */
for (i = 0; i < *laces - 1; i++) {
lace_size[i] = 0;
@ -1860,7 +1856,6 @@ static int demux_mkv_read_block_lacing(bstr *buffer, int *laces,
lace_size[i] = buffer->len - total;
break;
}
break;
}
return 0;