Browse code

dvbsubdec: move shared codepath

CC: libav-stable@libav.org
Bug-Id: CID 1238839

Vittorio Giovara authored on 2014/11/09 16:48:45
Showing 1 changed files
... ...
@@ -693,26 +693,19 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
693 693
                 if (run_length == 0) {
694 694
                     return pixels_read;
695 695
                 }
696
-
697
-                if (map_table)
698
-                    bits = map_table[0];
699
-                else
700
-                    bits = 0;
701
-                while (run_length-- > 0 && pixels_read < dbuf_len) {
702
-                    *destbuf++ = bits;
703
-                    pixels_read++;
704
-                }
705 696
             } else {
706 697
                 bits = *(*srcbuf)++;
707 698
 
708 699
                 if (non_mod == 1 && bits == 1)
709 700
                     pixels_read += run_length;
710
-                if (map_table)
711
-                    bits = map_table[bits];
712
-                else while (run_length-- > 0 && pixels_read < dbuf_len) {
713
-                    *destbuf++ = bits;
714
-                    pixels_read++;
715
-                }
701
+            }
702
+            if (map_table)
703
+                bits = map_table[0];
704
+            else
705
+                bits = 0;
706
+            while (run_length-- > 0 && pixels_read < dbuf_len) {
707
+                *destbuf++ = bits;
708
+                pixels_read++;
716 709
             }
717 710
         }
718 711
     }