RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-20 05:46:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de' into release/0.10

Browse Source 
* commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de':
  error_concealment: avoid using the picture if not fully setup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-12 18:58:04 +02:00
commit 688ab26604
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/error_resilience.c
View File

@ -921,6 +921,12 @@ void ff_er_frame_end(MpegEncContext *s)
return; 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) { if (s->current_picture.f.motion_val[0] == NULL) {
av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n"); av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n");