git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22af79a
)
hevc: delay ff_thread_finish_setup for hwaccel
author
Rainer Hochecker
<fernetmenta@online.de>
Thu, 12 Mar 2015 13:08:25 +0000
(14:08 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 12 Mar 2015 13:49:41 +0000
(14:49 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c
patch
|
blob
|
history
diff --git
a/libavcodec/hevc.c
b/libavcodec/hevc.c
index
fdbaa28
..
b7ad29a
100644
(file)
--- 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;