virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/pthread_frame: always transfer stashed hwaccel state

Browse Source 
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>
This commit is contained in:
Anton Khirnov
2022-09-19 14:50:30 +02:00
parent e301143f96
commit c504fb8692
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pthread_frame.c
View File

@@ -459,13 +459,13 @@ static int submit_packet(PerThreadContext *p, AVCodecContext *user_avctx,
pthread_mutex_unlock(&p->mutex); pthread_mutex_unlock(&p->mutex);
return err; return err;
} }
}
/* transfer hwaccel state stashed from previous thread, if any */ /* transfer the stashed hwaccel state, if any */
av_assert0(!p->avctx->hwaccel); av_assert0(!p->avctx->hwaccel);
FFSWAP(const AVHWAccel*, p->avctx->hwaccel, fctx->stash_hwaccel); FFSWAP(const AVHWAccel*, p->avctx->hwaccel, fctx->stash_hwaccel);
FFSWAP(void*, p->avctx->hwaccel_context, fctx->stash_hwaccel_context); FFSWAP(void*, p->avctx->hwaccel_context, fctx->stash_hwaccel_context);
FFSWAP(void*, p->avctx->internal->hwaccel_priv_data, fctx->stash_hwaccel_priv); FFSWAP(void*, p->avctx->internal->hwaccel_priv_data, fctx->stash_hwaccel_priv);
}
av_packet_unref(p->avpkt); av_packet_unref(p->avpkt);
ret = av_packet_ref(p->avpkt, avpkt); ret = av_packet_ref(p->avpkt, avpkt);