Merge branch 'master' into epoxy

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 1ecee63d660cbac4d2565e846c908cc26efad0b0..a1bf3cb80241167b6f0bda72bf1ea3e974ed98d3 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -287,7 +287,6 @@ private:
        std::map<Effect *, Node *> node_map;
        Effect *dither_effect;
 
-       std::map<void *, GLuint> fbos;  // One for each OpenGL context.
        std::vector<Input *> inputs;  // Also contained in nodes.
        std::vector<Phase *> phases;