diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-15 21:28:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-15 21:28:43 +0200 |
| commit | 7d2e4673b1528fb1e4838db05d9edca6393ced22 (patch) | |
| tree | 422eb9ba7c328d80a2f945c21390e6ea186fb904 /libavcodec/dvbsubdec.c | |
| parent | 294ea2cfc6ac489a533904e1ca650ee8fddfa311 (diff) | |
dvbsubdec: Fix 0xf0 end detection
Based on a change by JULIAN GARDNER
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 2a24877689..e3e6a0b156 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -798,7 +798,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis y_pos += top_bottom; while (buf < buf_end) { - if (x_pos >= region->width || y_pos >= region->height) { + if ((*buf!=0xf0 && x_pos >= region->width) || y_pos >= region->height) { av_log(avctx, AV_LOG_ERROR, "Invalid object location! %d-%d %d-%d %02x\n", x_pos, region->width, y_pos, region->height, *buf); return; } |