diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-11-28 22:17:14 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-11-29 14:40:05 +0100 |
| commit | c1fcf563b13051f280db169ba41c6a1b21b25e08 (patch) | |
| tree | 2e519804d9332fd2f79e9e4a951ecf14d4c3cbb5 | |
| parent | 3ae69b91668e3d9b65af4007eb5871397cf0b0ab (diff) | |
| download | ffmpeg-c1fcf563b13051f280db169ba41c6a1b21b25e08.tar.gz | |
h264: check context state before decoding slice data partitions
Fixes mov_h264_aac__Demo_FlagOfOurFathers.mov.SIGSEGV.4e9.656.
Found-by: Mateusz "j00ru" Jurczyk
CC: libav-stable@libav.org
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8b9ac5c232..e3075cbe6f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3848,6 +3848,7 @@ again: if (hx->redundant_pic_count == 0 && hx->intra_gb_ptr && hx->s.data_partitioning && + s->current_picture_ptr && s->context_initialized && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_BIDIR || |