diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-09-19 14:50:30 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-09-23 16:06:27 +0200 |
| commit | c504fb869264fbd8fba6e81c186b2f2848b62e26 (patch) | |
| tree | eb010adbbcccc4df8af112cd30d0d1897a940058 /libavcodec | |
| parent | e301143f96639b97a8e9a0045f93b56e0f399289 (diff) | |
| download | ffmpeg-c504fb869264fbd8fba6e81c186b2f2848b62e26.tar.gz | |
lavc/pthread_frame: always transfer stashed hwaccel state
Fixes assertion failures after avcodec_flush_buffers(), where
stashed hwaccel state is present, but prev_thread is NULL.
Found-by: Wang Bin <wbsecg1@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread_frame.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 066269621d..f8fddc5e4d 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -459,14 +459,14 @@ static int submit_packet(PerThreadContext *p, AVCodecContext *user_avctx, pthread_mutex_unlock(&p->mutex); return err; } - - /* transfer hwaccel state stashed from previous thread, if any */ - av_assert0(!p->avctx->hwaccel); - FFSWAP(const AVHWAccel*, p->avctx->hwaccel, fctx->stash_hwaccel); - FFSWAP(void*, p->avctx->hwaccel_context, fctx->stash_hwaccel_context); - FFSWAP(void*, p->avctx->internal->hwaccel_priv_data, fctx->stash_hwaccel_priv); } + /* transfer the stashed hwaccel state, if any */ + av_assert0(!p->avctx->hwaccel); + FFSWAP(const AVHWAccel*, p->avctx->hwaccel, fctx->stash_hwaccel); + FFSWAP(void*, p->avctx->hwaccel_context, fctx->stash_hwaccel_context); + FFSWAP(void*, p->avctx->internal->hwaccel_priv_data, fctx->stash_hwaccel_priv); + av_packet_unref(p->avpkt); ret = av_packet_ref(p->avpkt, avpkt); if (ret < 0) { |