diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-09-19 14:50:30 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-09-25 10:01:34 +0200 |
| commit | fe741cd0afbbfe54f636c5dce9b452edc022f8f9 (patch) | |
| tree | d9776d685569044ba2894adb8b731b86be0e06cf | |
| parent | 57e15b2e07d0194d710e0de2a28ac70bdcf8aaeb (diff) | |
| download | ffmpeg-fe741cd0afbbfe54f636c5dce9b452edc022f8f9.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>
(cherry picked from commit c504fb869264fbd8fba6e81c186b2f2848b62e26)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -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 e40dcedfdd..1dba176084 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -452,14 +452,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) { |