virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

pthread_frame: change the criterium for updating thread contexts

Browse Source 
Currently the next thread's context is updated from the previous one's
if the codec descriptor is not marked as intra-only. That is not
entirely correct, since that property does not necessarily imply
anything about how a specific decoder implementation behaves.

Instead, use the presence of the update_thread_context() callback to
decide whether an update should be performed. Fixes races in CFHD,
should cause no behaviour change in any other decoders.
This commit is contained in:
Anton Khirnov 2020-06-09 13:08:49 +02:00
parent 7321614a1b
commit f1feb3bd9d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pthread_frame.c
View File

@ -246,7 +246,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src,
{ {
int err = 0; int err = 0;
if (dst != src && (for_user || !(src->codec_descriptor->props & AV_CODEC_PROP_INTRA_ONLY))) { if (dst != src && (for_user || src->codec->update_thread_context)) {
dst->time_base = src->time_base; dst->time_base = src->time_base;
dst->framerate = src->framerate; dst->framerate = src->framerate;
dst->width = src->width; dst->width = src->width;