diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 15:46:52 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 15:46:52 +0200 |
| commit | 760dbdd3c56150a4dc5a4c5812e07c2bd759b934 (patch) | |
| tree | 4b4016c6b2297ec7700ace85a7a113f422f8509f /libavcodec/qsvenc.h | |
| parent | 00efaa798377502657d2f0267b5b62a4d05af195 (diff) | |
| parent | 772c87c5a658f36d7c0612f5da583fc2bfa54f79 (diff) | |
| download | ffmpeg-760dbdd3c56150a4dc5a4c5812e07c2bd759b934.tar.gz | |
Merge commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79'
* commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79':
qsvenc: support passing arbitrary external buffers to the encoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.h')
| -rw-r--r-- | libavcodec/qsvenc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 2a21f8217d..13f1419a76 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -52,10 +52,11 @@ typedef struct QSVEncContext { mfxExtCodingOption extco; #if QSV_VERSION_ATLEAST(1,6) mfxExtCodingOption2 extco2; - mfxExtBuffer *extparam[2]; + mfxExtBuffer *extparam_internal[2]; #else - mfxExtBuffer *extparam[1]; + mfxExtBuffer *extparam_internal[1]; #endif + mfxExtBuffer **extparam; AVFifoBuffer *async_fifo; |