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/dxva2_internal.h | |
| parent | b125822d1d07e305c0012ef67b8be0cb9261ee9f (diff) | |
| parent | b46a77f19ddc4b2b5fa3187835ceb602a5244e24 (diff) | |
| download | ffmpeg-48e4eda11d537c6ed52d1000aaa6ce5cbb641e25.tar.gz | |
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/dxva2_internal.h')
| -rw-r--r-- | libavcodec/dxva2_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 352a9db1ab..8bb3344090 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -156,6 +156,9 @@ int ff_dxva2_decode_init(AVCodecContext *avctx); int ff_dxva2_decode_uninit(AVCodecContext *avctx); +int ff_dxva2_common_frame_params(AVCodecContext *avctx, + AVBufferRef *hw_frames_ctx); + int ff_dxva2_is_d3d11(const AVCodecContext *avctx); #endif /* AVCODEC_DXVA2_INTERNAL_H */ |