git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
[ffmpeg.git]
/
libavcodec
/
pthread_frame.c
diff --git
a/libavcodec/pthread_frame.c
b/libavcodec/pthread_frame.c
index
f2ac735
..
fcaa001
100644
(file)
--- a/
libavcodec/pthread_frame.c
+++ b/
libavcodec/pthread_frame.c
@@
-226,6
+226,7
@@
static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src,
dst->sample_rate = src->sample_rate;
dst->sample_fmt = src->sample_fmt;
dst->channel_layout = src->channel_layout;
+ dst->internal->hwaccel_priv_data = src->internal->hwaccel_priv_data;
}
if (for_user) {