summaryrefslogtreecommitdiffstats
path: root/video/decode/lavc.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-02-27 14:33:18 +0100
committerwm4 <wm4@nowhere>2017-02-27 14:41:24 +0100
commit6e3fbaba7e134b825f6fe9ceb83d2d052e3d85db (patch)
tree58b6c2c58c4f7e421db087a4bb192a3c25c55230 /video/decode/lavc.h
parent9714e04e94b66822a7309961b2141ce0032a1121 (diff)
downloadmpv-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/lavc.h')
-rw-r--r--video/decode/lavc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/video/decode/lavc.h b/video/decode/lavc.h
index dfce9c3bfd..4df92e40a6 100644
--- a/video/decode/lavc.h
+++ b/video/decode/lavc.h
@@ -16,8 +16,7 @@
// This number might require adjustment depending on whatever the player does;
// for example, if vo_opengl increases the number of reference surfaces for
// interpolation, this value has to be increased too.
-// This value does not yet include HWDEC_DELAY_QUEUE_COUNT.
-#define HWDEC_EXTRA_SURFACES 4
+#define HWDEC_EXTRA_SURFACES 6
struct mpv_global;