Merge commit '5a1a9da8'

* commit '5a1a9da8':
  mpegvideo: Drop a stray error message
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavcodec/mpegvideo.c

@@ -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]);
         }
     }