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/vdpau_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/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 30d01af65d..4d63e50b16 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -119,5 +119,7 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame, int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx); int ff_vdpau_add_buffer(struct vdpau_picture_context *pic, const uint8_t *buf, uint32_t buf_size); +int ff_vdpau_common_frame_params(AVCodecContext *avctx, + AVBufferRef *hw_frames_ctx); #endif /* AVCODEC_VDPAU_INTERNAL_H */ |