diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 04:44:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 01:00:02 +0100 |
| commit | 3e196e4def03c7a91423803402f84d638d316c33 (patch) | |
| tree | c59b6c0884a645c49be86e8edbb53694a44fe515 /libavcodec/error_resilience.c | |
| parent | 2502914c5f8eb77659d7c0868396862557a63245 (diff) | |
| download | ffmpeg-3e196e4def03c7a91423803402f84d638d316c33.tar.gz | |
error_concealment: Check that the picture is not in a half setup state.
Fixes state becoming inconsistent
Fixes a null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 23318a57358358e7a4dc551e830e4503f0638cfe)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 6ae06f2ad1..a166256a18 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -923,6 +923,12 @@ void ff_er_frame_end(MpegEncContext *s) return; }; + if ( s->picture_structure == PICT_FRAME + && s->current_picture.f.linesize[0] != s->current_picture_ptr->f.linesize[0]) { + av_log(s->avctx, AV_LOG_ERROR, "Error concealment not possible, frame not fully initialized\n"); + return; + } + if (s->current_picture.f.motion_val[0] == NULL) { av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n"); |