OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
294ea2c
)
dvbsubdec: Fix 0xf0 end detection
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 15 Oct 2011 19:28:43 +0000
(21:28 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 15 Oct 2011 19:28:43 +0000
(21:28 +0200)
Based on a change by JULIAN GARDNER
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvbsubdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/dvbsubdec.c
b/libavcodec/dvbsubdec.c
index
2a24877
..
e3e6a0b
100644
(file)
--- 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;
}