diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-09 08:48:45 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-11 11:49:54 +0100 |
| commit | 443502aed8b814d883825e52e91e4f018955aa66 (patch) | |
| tree | 23de45a8642737835008e42163537ed9482e1c08 /libavcodec/dvbsubdec.c | |
| parent | 2383323661f3b8342b2c4d356fcfe8c5d1b045f8 (diff) | |
| download | ffmpeg-443502aed8b814d883825e52e91e4f018955aa66.tar.gz | |
dvbsubdec: move shared codepath
CC: libav-stable@libav.org
Bug-Id: CID 1238839
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 23 |
1 files changed, 8 insertions, 15 deletions
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++; } } } |