diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
| commit | 0a731e45964cda0606fc04128f41353d8282f091 (patch) | |
| tree | 652c5ac32280da901becae1c152ea73012bab921 /libavcodec/qsv_internal.h | |
| parent | d985976e54aec274d0c261091f77559d1a1bef84 (diff) | |
| parent | 72b7441a10f578a1d0be7083d8f5adf6a01921c2 (diff) | |
| download | ffmpeg-0a731e45964cda0606fc04128f41353d8282f091.tar.gz | |
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
lavc: add Intel libmfx-based H.264 encoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsv_internal.h')
| -rw-r--r-- | libavcodec/qsv_internal.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index b1079139b6..1d059b8ac6 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -21,11 +21,24 @@ #ifndef AVCODEC_QSV_INTERNAL_H #define AVCODEC_QSV_INTERNAL_H +#include <mfx/mfxvideo.h> + +#include "libavutil/frame.h" + #define QSV_VERSION_MAJOR 1 #define QSV_VERSION_MINOR 1 #define ASYNC_DEPTH_DEFAULT 4 // internal parallelism +typedef struct QSVFrame { + AVFrame *frame; + mfxFrameSurface1 *surface; + + mfxFrameSurface1 surface_internal; + + struct QSVFrame *next; +} QSVFrame; + /** * Convert a libmfx error code into a libav error code. */ |