diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-12-03 15:21:40 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-03-21 06:16:49 +0100 |
| commit | 14bb15bfd56d6e907fabe4620206c1ee152b7a20 (patch) | |
| tree | 38e19eed9e77d3555c146517161c5c45a67de5fd /libavcodec/h263dec.c | |
| parent | c358c62550e60a150c49f192d72631142a6eedd6 (diff) | |
pthread_frame: ensure the threads don't run simultaneously with hwaccel
Merges Libav commit 8dfba25c.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index c440537e8f..077666470d 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -600,7 +600,7 @@ retry: if ((ret = ff_mpv_frame_start(s, avctx)) < 0) return ret; - if (!s->divx_packed && !avctx->hwaccel) + if (!s->divx_packed) ff_thread_finish_setup(avctx); #if FF_API_CAP_VDPAU |