diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-22 15:36:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-22 15:36:50 +0100 |
| commit | a9cfbf6d4b08a8b4ceb610f08f1cc232b090ba8f (patch) | |
| tree | d5d3080338172b270439e283e8b96c07fbe3ad56 /libavcodec/cdgraphics.c | |
| parent | c8a5365dcf14e930d1fd06bf10662aae78182da4 (diff) | |
| parent | 9ae80e6a9cefcab61e867256ba19ef78a4bfe0cb (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
id3v2: fix reading unsynchronized frames.
cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
apetag: fix error handling in ff_ape_parse_tag()
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cdgraphics.c')
| -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 1f666fc363..eb315321ce 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; |