diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 16:08:42 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 16:08:42 +0200 |
| commit | 1789e46d34c11da6067f7035f9221ecc49e79552 (patch) | |
| tree | fe0cef00150a253d134318851ee5d9aaf20d664c /libavcodec/mpegvideo.c | |
| parent | d02d208211eb9a9de2e082942d007d558b2ce110 (diff) | |
| parent | 5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17 (diff) | |
| download | ffmpeg-1789e46d34c11da6067f7035f9221ecc49e79552.tar.gz | |
Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17'
* commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17':
mpegvideo: Drop a stray error message
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f28f7e886b..eacebc2660 100644 --- a/libavcodec/mpegvideo.c +++ b/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]); } } |