[FFmpeg-cvslog] dvbsubdec: Fix 0xf0 end detection

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 15 21:28:43 2011 +0200| [7d2e4673b1528fb1e4838db05d9edca6393ced22] | committer: Michael Niedermayer

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d2e4673b1528fb1e4838db05d9edca6393ced22
---

 libavcodec/dvbsubdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 2a24877..e3e6a0b 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;
         }