[FFmpeg-devel] [PATCH 2/2] hevc: delay ff_thread_finish_setup for hwaccel

2015-03-12 Thread Rainer Hochecker 
---
 libavcodec/hevc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index b52e778..998d58e 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2605,7 +2605,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;
 
-- 
2.1.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 2/2] hevc: delay ff_thread_finish_setup for hwaccel

2015-03-12 Thread Michael Niedermayer 
On Thu, Mar 12, 2015 at 02:08:25PM +0100, Rainer Hochecker wrote:
 ---
  libavcodec/hevc.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Dictatorship naturally arises out of democracy, and the most aggravated
form of tyranny and slavery out of the most extreme liberty. -- Plato


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel