1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 8 Apr 2016 12:14:28 -0700
Subject: Fix compilation on X11-using platforms
---
src/ffmpegsource_common.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/ffmpegsource_common.h b/src/ffmpegsource_common.h
index 26a8a5f..210d403 100644
--- a/src/ffmpegsource_common.h
+++ b/src/ffmpegsource_common.h
@@ -52,6 +52,9 @@ class FFmpegSourceProvider {
public:
FFmpegSourceProvider(agi::BackgroundRunner *br);
+ // X11 is wonderful
+#undef None
+
enum class TrackSelection : int {
None = -1,
All = -2
|
