diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2015-03-12 14:08:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-22 12:27:24 +0200 |
| commit | eface550b9d3cc8f6b01d709af53e206257f04ae (patch) | |
| tree | 6d00de9f4d410592409921efa6ef050dcd6951b7 | |
| parent | 2aa21e8d95517893d75e0056c7a07218884ac356 (diff) | |
| download | ffmpeg-eface550b9d3cc8f6b01d709af53e206257f04ae.tar.gz | |
hevc: delay ff_thread_finish_setup for hwaccel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 31816eae32019ff0e2243533f618efa2a4da9c33)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index bdfc131de3..4290e5d1d1 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2148,7 +2148,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; fail: |