From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 15 Oct 2011 19:28:43 +0000 (+0200)
Subject: dvbsubdec: Fix 0xf0 end detection
X-Git-Tag: android-x86-4.4-r1~15558
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d2e4673b1528fb1e4838db05d9edca6393ced22;p=android-x86%2Fexternal-ffmpeg.git

dvbsubdec: Fix 0xf0 end detection
Based on a change by JULIAN GARDNER

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

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;
         }