diff options
| author | wm4 <wm4@nowhere> | 2017-02-27 14:33:18 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-02-27 14:41:24 +0100 |
| commit | 6e3fbaba7e134b825f6fe9ceb83d2d052e3d85db (patch) | |
| tree | 58b6c2c58c4f7e421db087a4bb192a3c25c55230 /video/decode/hw_dxva2.c | |
| parent | 9714e04e94b66822a7309961b2141ce0032a1121 (diff) | |
| download | mpv-6e3fbaba7e134b825f6fe9ceb83d2d052e3d85db.tar.bz2 mpv-6e3fbaba7e134b825f6fe9ceb83d2d052e3d85db.tar.xz | |
decode: fix extra surface count
FFmpeg could crash with vaapi (new) and --vo=opengl + interpolation.
It seems the actual surface count the old vaapi code uses (and which
usually never exceeded the preallocated amount) was higher than what
was used for the new vaapi code, so just correct that. The d3d helpers
also had weird code that bumped the real pool size, fix them as well.
Why this would result in an assertion failure instead of a proper error,
who knows.
Diffstat (limited to 'video/decode/hw_dxva2.c')
| -rw-r--r-- | video/decode/hw_dxva2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/decode/hw_dxva2.c b/video/decode/hw_dxva2.c index 7b1a6b4bc7..7be0d9b9fa 100644 --- a/video/decode/hw_dxva2.c +++ b/video/decode/hw_dxva2.c @@ -32,7 +32,7 @@ #include "d3d.h" -#define ADDITIONAL_SURFACES (HWDEC_EXTRA_SURFACES + HWDEC_DELAY_QUEUE_COUNT) +#define ADDITIONAL_SURFACES HWDEC_EXTRA_SURFACES struct priv { struct mp_log *log; |