diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-03-30 22:00:03 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-03-30 22:00:03 +0100 |
| commit | 2f18e452f88fc6ed7b0e308d4de5c386ee1b3a12 (patch) | |
| tree | d46ae6e853bc8837cb691269d6c4cb4a0ee14a00 /libavcodec/qsv_internal.h | |
| parent | e3f9c5826ace91bf8d933bd924df2eb4081da6c6 (diff) | |
| parent | 404e51478ecad060249d5b9bee6ab39a8a9d8c1c (diff) | |
| download | ffmpeg-2f18e452f88fc6ed7b0e308d4de5c386ee1b3a12.tar.gz | |
Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'
* commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c':
qsv{dec,enc}: always use an internal mfxFrameSurface1
Minor fixups for differences in the QSV encoder because of a53cc.
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/qsv_internal.h')
| -rw-r--r-- | libavcodec/qsv_internal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 6ccb72a236..b1567fbef8 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -40,12 +40,11 @@ typedef struct QSVFrame { AVFrame *frame; - mfxFrameSurface1 *surface; + mfxFrameSurface1 surface; mfxEncodeCtrl enc_ctrl; - mfxFrameSurface1 surface_internal; - int queued; + int used; struct QSVFrame *next; } QSVFrame; |