From 1d6558d9c89cd04ee98dedbd917de770234d0914 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 13 Apr 2013 18:44:11 +0200
Subject: demux_mkv: get rid of the duplicated lace case labels

Also change the extracting of the lace type bitfield from flags to
make it more apparent that the value range is 0-3.
---
 demux/demux_mkv.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'demux/demux_mkv.c')

diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index bc66ceaaf7..aa0ab47fad 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -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;
 
-- 
cgit v1.2.3