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/qsvdec.h | |
| parent | d985976e54aec274d0c261091f77559d1a1bef84 (diff) | |
| parent | 72b7441a10f578a1d0be7083d8f5adf6a01921c2 (diff) | |
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/qsvdec.h')
| -rw-r--r-- | libavcodec/qsvdec.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index 2221e4cdf2..373cc72b2a 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -32,15 +32,7 @@ #include "libavutil/pixfmt.h" #include "avcodec.h" - -typedef struct QSVFrame { - AVFrame *frame; - mfxFrameSurface1 *surface; - - mfxFrameSurface1 surface_internal; - - struct QSVFrame *next; -} QSVFrame; +#include "qsv_internal.h" typedef struct QSVContext { // the session used for decoding |