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:
700687e
)
ituh263: reject b-frame with pp_time = 0
author
Keiji Costantini
<strites@gmail.com>
Sat, 1 Mar 2014 18:17:04 +0000
(18:17 +0000)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Sat, 1 Mar 2014 22:17:30 +0000
(23:17 +0100)
Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.
Sample-Id:
00000168
-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavcodec/ituh263dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/ituh263dec.c
b/libavcodec/ituh263dec.c
index
e365210
..
98c8cfc
100644
(file)
--- a/
libavcodec/ituh263dec.c
+++ b/
libavcodec/ituh263dec.c
@@
-750,6
+750,8
@@
int ff_h263_decode_mb(MpegEncContext *s,
}
if(IS_DIRECT(mb_type)){
+ if (!s->pp_time)
+ return AVERROR_INVALIDDATA;
s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0);
}else{