diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:58:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:58:09 +0200 |
| commit | 688ab26604749539cfa5143bfc61a9d9f4d642aa (patch) | |
| tree | ac05baf804e80f499ceea9a3f52135b320f708df | |
| parent | a2c6cb260fdab9337e9a2aca2c53e5bf136dc3e1 (diff) | |
| parent | c79cf0129edafc388ba1c47cd7b6a620557e48de (diff) | |
| download | ffmpeg-688ab26604749539cfa5143bfc61a9d9f4d642aa.tar.gz | |
Merge commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de' into release/0.10
* commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de':
error_concealment: avoid using the picture if not fully setup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 0e5fe4ec79..7858d3ce10 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -921,6 +921,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"); |