ffmpeg | branch: master | Rainer Hochecker <fernetme...@online.de> | Thu Mar 12 14:08:25 2015 +0100| [31816eae32019ff0e2243533f618efa2a4da9c33] | committer: Michael Niedermayer
hevc: delay ff_thread_finish_setup for hwaccel Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31816eae32019ff0e2243533f618efa2a4da9c33 --- libavcodec/hevc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index fdbaa28..b7ad29a 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2600,7 +2600,8 @@ static int hevc_frame_start(HEVCContext *s) if (ret < 0) goto fail; - ff_thread_finish_setup(s->avctx); + if (!s->avctx->hwaccel) + ff_thread_finish_setup(s->avctx); return 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
