diff options
author | Mark Thompson <sw@jkqxz.net> | 2018-08-23 00:44:40 +0100 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2018-08-27 16:21:38 +0100 |
commit | c5b4ad247b9d691a4ebfb464633098368d7fbb4f (patch) | |
tree | 1272d1f0e2b39042bfd745fb83a599d342ec1081 /libavcodec/vaapi_encode.c | |
parent | 1616106f1168982c7a6e060512447d917cfd6076 (diff) | |
download | ffmpeg-c5b4ad247b9d691a4ebfb464633098368d7fbb4f.tar.gz |
vaapi_encode: Remove common priv_data and options fields
The codec-specific context now contains both the common context and the
codec-specific options directly.
Diffstat (limited to 'libavcodec/vaapi_encode.c')
-rw-r--r-- | libavcodec/vaapi_encode.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 910fd1b365..cedf3d3549 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1372,17 +1372,9 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - ctx->codec_options = ctx->codec_options_data; - ctx->va_config = VA_INVALID_ID; ctx->va_context = VA_INVALID_ID; - ctx->priv_data = av_mallocz(ctx->codec->priv_data_size); - if (!ctx->priv_data) { - err = AVERROR(ENOMEM); - goto fail; - } - ctx->input_frames_ref = av_buffer_ref(avctx->hw_frames_ctx); if (!ctx->input_frames_ref) { err = AVERROR(ENOMEM); @@ -1583,7 +1575,5 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx) av_buffer_unref(&ctx->input_frames_ref); av_buffer_unref(&ctx->device_ref); - av_freep(&ctx->priv_data); - return 0; } |