Merge master.

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index a97562b98c1881a983d730e71c4c98d85c370626..a19d2fff13ffe369e28bd1e50e8350d26161a840 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1067,9 +1067,7 @@ FilmEditor::setup_formats ()
 
        vector<Format const *> fmt = Format::all ();
        for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
-               if (c == VIDEO && dynamic_cast<FixedFormat const *> (*i)) {
-                       _formats.push_back (*i);
-               } else if (c == STILL && dynamic_cast<VariableFormat const *> (*i)) {
+               if (c == VIDEO || (c == STILL && dynamic_cast<VariableFormat const *> (*i))) {
                        _formats.push_back (*i);
                }
        }