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/decode.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/decode.h')
| -rw-r--r-- | libavcodec/decode.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 03fc783bba..424e85e914 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -24,6 +24,10 @@ #include "libavutil/buffer.h" #include "libavutil/frame.h" +#include "libavutil/buffer.h" +#include "libavutil/frame.h" +#include "libavutil/hwcontext.h" + #include "avcodec.h" /** @@ -65,6 +69,14 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt); void ff_decode_bsfs_uninit(AVCodecContext *avctx); +/** + * Make sure avctx.hw_frames_ctx is set. If it's not set, the function will + * try to allocate it from hw_device_ctx. If that is not possible, an error + * message is printed, and an error code is returned. + */ +int ff_decode_get_hw_frames_ctx(AVCodecContext *avctx, + enum AVHWDeviceType dev_type); + int ff_attach_decode_data(AVFrame *frame); #endif /* AVCODEC_DECODE_H */ |