diff options
| author | Keiji Costantini <strites@gmail.com> | 2014-03-01 18:17:04 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-05-31 20:03:35 -0400 |
| commit | 16f0f97eec7945d082b74ed88de382bac21538ca (patch) | |
| tree | 8e313bd40268b17665f5e99f6392ce0b0cfe7637 | |
| parent | f1a8885ae9e7f281b597d1f9188fc16fb2ab7832 (diff) | |
| download | ffmpeg-16f0f97eec7945d082b74ed88de382bac21538ca.tar.gz | |
ituh263: reject b-frame with pp_time = 0
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>
(cherry picked from commit 9514440337875e0c63b409abcd616b68c518283f)
(cherry picked from commit 5df52b0131d3d4d804ad6e221bc9a2cd8b201ef2)
(cherry picked from commit aa2a3ca27a3269e2b975686652204607fad8bc49)
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 028d2a16a6..ebbead478b 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -753,6 +753,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{ |