[FFmpeg-cvslog] hevc: delay ff_thread_finish_setup for hwaccel

[Rainer Hochecker]

ffmpeg | branch: release/2.6 | Rainer Hochecker <fernetmenta at online.de> | Thu Mar 12 14:08:25 2015 +0100| [ea52c0614c18a1d164075a641c3671089a351725] | committer: Michael Niedermayer

hevc: delay ff_thread_finish_setup for hwaccel

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 31816eae32019ff0e2243533f618efa2a4da9c33)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea52c0614c18a1d164075a641c3671089a351725
---

 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;