diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2015-03-12 14:08:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 13:04:32 +0100 |
| commit | ea52c0614c18a1d164075a641c3671089a351725 (patch) | |
| tree | bf98cf9aba38e22555f3847d42d7441bd0117b0b /libavcodec | |
| parent | 5e84ab838ca3e255a9548e85cb5e2d64647e46d2 (diff) | |
| download | ffmpeg-ea52c0614c18a1d164075a641c3671089a351725.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>
Diffstat (limited to 'libavcodec')
| -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 fdbaa28a97..b7ad29a081 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; |