diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:51:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:51:33 +0100 |
| commit | ace0cfea60a32c2d2c89ce31fed8466625b09ac6 (patch) | |
| tree | 442bd781b252ab542a7ebbc8b6a0435ae8cab05d /libavcodec/pthread.c | |
| parent | 12f203a0987935b79870a9502b7e148fa064897c (diff) | |
| parent | 05fa79b8448059913dea321fdf92764b64deeecc (diff) | |
| download | ffmpeg-ace0cfea60a32c2d2c89ce31fed8466625b09ac6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: fix use with frame based multithreading
Conflicts:
libavcodec/h263dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 9dbaec3dc8..29a2308fae 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -450,6 +450,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) { |