diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 16:06:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 16:06:27 +0200 |
| commit | b65c290f7fecde65755cfb4ae1e452dcd0f07464 (patch) | |
| tree | fd0c9381faf4371bcd3153bb4edb38aee28a7c51 | |
| parent | 09e3fe79fc09459e62db73350909bda138792019 (diff) | |
| parent | 52254067b312e78d30bbe79fc33dbdf995b22b4e (diff) | |
| download | ffmpeg-b65c290f7fecde65755cfb4ae1e452dcd0f07464.tar.gz | |
Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1
* commit '52254067b312e78d30bbe79fc33dbdf995b22b4e':
error_concealment: avoid using the picture if not fully setup
Conflicts:
libavcodec/error_resilience.c
See: 68a0477bc0af026db971ddba22541029a9e8715b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/error_resilience.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 2b6bc42ade..c2488fc0bc 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -924,8 +924,8 @@ 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]) { + 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; } |