diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2015-03-12 14:08:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 14:49:41 +0100 |
| commit | 31816eae32019ff0e2243533f618efa2a4da9c33 (patch) | |
| tree | e70af229b7dc865ec0cd251f57a4dd221af7c0ac /libavcodec/hevc.c | |
| parent | 22af79a9c88f8bfaa8c4130c8f58c5bff20e1a1f (diff) | |
| download | ffmpeg-31816eae32019ff0e2243533f618efa2a4da9c33.tar.gz | |
hevc: delay ff_thread_finish_setup for hwaccel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -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; |