diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-06-09 13:08:49 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2020-07-07 11:03:09 +0200 |
| commit | f1feb3bd9dbff6e15ee9f981d79d353ffdc15c0b (patch) | |
| tree | 2cfebe6f5686018696627603308dcb24008315ce | |
| parent | 7321614a1b29ba4e92b47c5786a1739baaa25f9b (diff) | |
| download | ffmpeg-f1feb3bd9dbff6e15ee9f981d79d353ffdc15c0b.tar.gz | |
pthread_frame: change the criterium for updating thread contexts
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.
| -rw-r--r-- | libavcodec/pthread_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 601f170447..3255aa9337 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -246,7 +246,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, { 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->framerate = src->framerate; dst->width = src->width; |