From 443502aed8b814d883825e52e91e4f018955aa66 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sun, 9 Nov 2014 08:48:45 +0100 Subject: dvbsubdec: move shared codepath CC: libav-stable@libav.org Bug-Id: CID 1238839 --- libavcodec/dvbsubdec.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 839465b09b..3d6e313f71 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -693,26 +693,19 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, if (run_length == 0) { return pixels_read; } - - if (map_table) - bits = map_table[0]; - else - bits = 0; - while (run_length-- > 0 && pixels_read < dbuf_len) { - *destbuf++ = bits; - pixels_read++; - } } else { bits = *(*srcbuf)++; if (non_mod == 1 && bits == 1) pixels_read += run_length; - if (map_table) - bits = map_table[bits]; - else while (run_length-- > 0 && pixels_read < dbuf_len) { - *destbuf++ = bits; - pixels_read++; - } + } + if (map_table) + bits = map_table[0]; + else + bits = 0; + while (run_length-- > 0 && pixels_read < dbuf_len) { + *destbuf++ = bits; + pixels_read++; } } } -- cgit v1.2.3