Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
JULIAN GARDNER 13 years ago committed by Michael Niedermayer
parent 337496980e
commit eea064aea6
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavcodec/dvbsubdec.c

12
libavcodec/dvbsubdec.c
Unescape View File

@ -532,14 +532,14 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
} }
} }
} else if (bits == 1) { } else if (bits == 1) {
pixels_read += 2;
if (map_table) if (map_table)
bits = map_table[0]; bits = map_table[0];
else else
bits = 0; bits = 0;
if (pixels_read <= dbuf_len) { run_length = 2;
*destbuf++ = bits; while (run_length-- > 0 && pixels_read < dbuf_len) {
*destbuf++ = bits; *destbuf++ = bits;
pixels_read++;
} }
} else { } else {
(*srcbuf) += (get_bits_count(&gb) + 7) >> 3; (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
@ -656,14 +656,14 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
} }
} }
} else if (bits == 1) { } else if (bits == 1) {
pixels_read += 2;
if (map_table) if (map_table)
bits = map_table[0]; bits = map_table[0];
else else
bits = 0; bits = 0;
if (pixels_read <= dbuf_len) { run_length = 2;
*destbuf++ = bits; while (run_length-- > 0 && pixels_read < dbuf_len) {
*destbuf++ = bits; *destbuf++ = bits;
pixels_read++;
} }
} else { } else {
if (map_table) if (map_table)

Write Preview
Loading…
Cancel
Save