diff options
| author | Xi Wang <xi.wang@gmail.com> | 2012-11-14 03:42:37 -0500 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-11-21 14:35:26 +0100 |
| commit | 0d3123666a42ed6c74d0a052342175261304b8ca (patch) | |
| tree | a254486118c83798be4b45b17423afcdcb8aa1c8 /libavcodec | |
| parent | b655cfefafd565590bfc5976b9ce8dd141b3c41c (diff) | |
| download | ffmpeg-0d3123666a42ed6c74d0a052342175261304b8ca.tar.gz | |
cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
The vertical offset mask 0x07 is suspicious.
v_off = FFMIN(data[2] & 0x07, CDG_BORDER_HEIGHT - 1);
Note that v_off is up to 11 (CDG_BORDER_HEIGHT - 1), the correct mask
should be 0x0F.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cdgraphics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 21de07effb..631c415124 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -218,7 +218,7 @@ static void cdg_scroll(CDGraphicsContext *cc, uint8_t *data, vscmd = (data[2] & 0x30) >> 4; h_off = FFMIN(data[1] & 0x07, CDG_BORDER_WIDTH - 1); - v_off = FFMIN(data[2] & 0x07, CDG_BORDER_HEIGHT - 1); + v_off = FFMIN(data[2] & 0x0F, CDG_BORDER_HEIGHT - 1); /// find the difference and save the offset for cdg_tile_block usage hinc = h_off - cc->hscroll; |