diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2013-03-14 02:36:51 +0400 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2013-03-26 22:44:50 +0400 |
| commit | 05fa79b8448059913dea321fdf92764b64deeecc (patch) | |
| tree | 59d7af37b80925df399b5ac8d39b61962d3ea50d /libavcodec/pthread.c | |
| parent | c24469e812501903a46a06eff9722a82e136e841 (diff) | |
hwaccel: fix use with frame based multithreading
Allows use of AVHWAccel based decoders with frame based multithreading.
The decoders will be forced into an non-concurrent mode by delaying
ff_thread_finish_setup() calls after decoding of the current frame
is finished.
This wastes memory by unnecessarily using multiple threads and thus
copies of the decoder context but allows seamless switching between
hardware accelerated and frame threaded software decoding when the
hardware decoder does not support the stream.
Diffstat (limited to 'libavcodec/pthread.c')
| -rw-r--r-- | libavcodec/pthread.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 9a92288dbb..404804dec1 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -428,6 +428,9 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, dst->colorspace = src->colorspace; dst->color_range = src->color_range; dst->chroma_sample_location = src->chroma_sample_location; + + dst->hwaccel = src->hwaccel; + dst->hwaccel_context = src->hwaccel_context; } if (for_user) { |