pthread_frame: properly propagate the hw frame context across frame threads

8 years ago · 84f225684c
parent 72a19f4013
commit 84f225684c
1 changed files with 11 additions and 0 deletions
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@ -223,6 +223,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
        dst->hwaccel = src->hwaccel;
        dst->hwaccel_context = src->hwaccel_context;
        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) {