diff options
| -rw-r--r-- | libavutil/hwcontext.c | 4 | ||||
| -rw-r--r-- | libavutil/hwcontext_qsv.c | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 2f4ee96..048e821 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -650,6 +650,10 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr, goto fail; done: + ret = av_hwdevice_ctx_init(dst_ref); + if (ret < 0) + goto fail; + *dst_ref_ptr = dst_ref; return 0; diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 75057f7..f1d16d8 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1037,16 +1037,6 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx, goto fail; } - ret = qsv_device_init(ctx); - if (ret < 0) - goto fail; - if (s->handle_type != handle_type) { - av_log(ctx, AV_LOG_ERROR, "Error in child device handle setup: " - "type mismatch (%d != %d).\n", s->handle_type, handle_type); - err = AVERROR_UNKNOWN; - goto fail; - } - return 0; fail: |
