diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 15:54:14 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 15:55:43 +0200 |
| commit | 866a4174dba066780c7be1ebdaa0152161cdf3e0 (patch) | |
| tree | 18965c935c72e99a74a56b54ef150bad9df4ebe5 /libavcodec/qsvenc.h | |
| parent | a440886a35e3329830d0c96311a80bd0f08ef6f3 (diff) | |
| parent | dc923bc23b3efd949d0bf67ff1abdb95059e5843 (diff) | |
| download | ffmpeg-866a4174dba066780c7be1ebdaa0152161cdf3e0.tar.gz | |
Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'
* commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843':
qsvenc: add an API for allocating opaque surfaces
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.h')
| -rw-r--r-- | libavcodec/qsvenc.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 13f1419a76..3dd7afe041 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -52,10 +52,15 @@ typedef struct QSVEncContext { mfxExtCodingOption extco; #if QSV_VERSION_ATLEAST(1,6) mfxExtCodingOption2 extco2; - mfxExtBuffer *extparam_internal[2]; -#else - mfxExtBuffer *extparam_internal[1]; #endif + + mfxExtOpaqueSurfaceAlloc opaque_alloc; + mfxFrameSurface1 **opaque_surfaces; + AVBufferRef *opaque_alloc_buf; + + mfxExtBuffer *extparam_internal[3]; + int nb_extparam_internal; + mfxExtBuffer **extparam; AVFifoBuffer *async_fifo; |