diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:06:35 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:06:35 +0400 |
| commit | c4fe50b954a0490c54efca19682cfae00eba3145 (patch) | |
| tree | cb22437d8ba280f221417ed8638b5a0b26413b75 /libavcodec/avcodec.h | |
| parent | fa0f7c024e90a5337892cbc3b78e936ba5d25cf3 (diff) | |
| parent | ebc29519d1634bfeb386c20a5d8a52837aae2436 (diff) | |
Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'
* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
hwaccel: Support specific frame allocators
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 70747ee0f0..431e0eab56 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3243,6 +3243,11 @@ typedef struct AVHWAccel { struct AVHWAccel *next; /** + * Allocate a custom buffer + */ + int (*alloc_frame)(AVCodecContext *avctx, AVFrame *frame); + + /** * Called at the beginning of each frame or field picture. * * Meaningful frame information (codec specific) is guaranteed to |