diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 18:58:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 20:33:26 -0300 |
| commit | 48e4eda11d537c6ed52d1000aaa6ce5cbb641e25 (patch) | |
| tree | a47751225502234d83afae7bee047f213ff6cf58 /libavcodec/vaapi_decode.h | |
| parent | b125822d1d07e305c0012ef67b8be0cb9261ee9f (diff) | |
| parent | b46a77f19ddc4b2b5fa3187835ceb602a5244e24 (diff) | |
Merge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24'
* commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24':
lavc: external hardware frame pool initialization
Includes the fix from e724bdfffbd3c27aac53d1f32f20f105f37caef0
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vaapi_decode.h')
| -rw-r--r-- | libavcodec/vaapi_decode.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index 550ee05432..1fcecac468 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -53,8 +53,6 @@ typedef struct VAAPIDecodePicture { } VAAPIDecodePicture; typedef struct VAAPIDecodeContext { - VAProfile va_profile; - VAEntrypoint va_entrypoint; VAConfigID va_config; VAContextID va_context; @@ -98,4 +96,7 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx, int ff_vaapi_decode_init(AVCodecContext *avctx); int ff_vaapi_decode_uninit(AVCodecContext *avctx); +int ff_vaapi_common_frame_params(AVCodecContext *avctx, + AVBufferRef *hw_frames_ctx); + #endif /* AVCODEC_VAAPI_DECODE_H */ |