Commit 98f89d61 authored by Anton Khirnov's avatar Anton Khirnov Committed by wm4

pthread_frame: properly propagate the hw frame context across frame threads

Merges Libav commit 84f22568.
Signed-off-by: 's avatarwm4 <nfxjfg@googlemail.com>
parent b6587421
...@@ -235,6 +235,17 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -235,6 +235,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
dst->sample_fmt = src->sample_fmt; dst->sample_fmt = src->sample_fmt;
dst->channel_layout = src->channel_layout; dst->channel_layout = src->channel_layout;
dst->internal->hwaccel_priv_data = src->internal->hwaccel_priv_data; dst->internal->hwaccel_priv_data = src->internal->hwaccel_priv_data;
if (!!dst->hw_frames_ctx != !!src->hw_frames_ctx ||
(dst->hw_frames_ctx && dst->hw_frames_ctx->data != src->hw_frames_ctx->data)) {
av_buffer_unref(&dst->hw_frames_ctx);
if (src->hw_frames_ctx) {
dst->hw_frames_ctx = av_buffer_ref(src->hw_frames_ctx);
if (!dst->hw_frames_ctx)
return AVERROR(ENOMEM);
}
}
} }
if (for_user) { if (for_user) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment