Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17'

* commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17':
  mpegvideo: Drop a stray error message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-07 16:08:42 +02:00
commit 1789e46d34

View File

@ -1201,9 +1201,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
if (&s->picture[i] != s->last_picture_ptr &&
&s->picture[i] != s->next_picture_ptr &&
s->picture[i].reference && !s->picture[i].needs_realloc) {
if (!(avctx->active_thread_type & FF_THREAD_FRAME))
av_log(avctx, AV_LOG_ERROR,
"releasing zombie picture\n");
ff_mpeg_unref_picture(s->avctx, &s->picture[i]);
}
}