OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c45fcf3
)
mpegvideo: Drop a stray error message
author
Luca Barbato
<lu_zero@gentoo.org>
Wed, 2 Sep 2015 11:55:47 +0000
(13:55 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Thu, 3 Sep 2015 11:39:34 +0000
(13:39 +0200)
The condition is not a failure.
libavcodec/mpegvideo.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
ae6fb7e
..
c5e8040
100644
(file)
--- a/
libavcodec/mpegvideo.c
+++ b/
libavcodec/mpegvideo.c
@@
-1068,9
+1068,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]);
}
}