diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:13:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:13:35 +0200 |
| commit | f929081f2e64d979fd8c58b17705e9554f99baf9 (patch) | |
| tree | 2d0ebbfdefb78f3921f4c4a425a80e3f548a1a3e /libavcodec/qsv_internal.h | |
| parent | 7093e215d02ed0dc9632f82ac8ccec432d29cd35 (diff) | |
| parent | f5c4d38c78347b09478e21a661befff4b2d44643 (diff) | |
| download | ffmpeg-f929081f2e64d979fd8c58b17705e9554f99baf9.tar.gz | |
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qsv_internal.h')
| -rw-r--r-- | libavcodec/qsv_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 3d949dc0fa..b9ad199e33 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -55,6 +55,8 @@ typedef struct QSVFrame { mfxFrameSurface1 surface_internal; + int queued; + struct QSVFrame *next; } QSVFrame; |