diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-02 20:12:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-02 20:12:50 +0000 |
| commit | 0b6652b491ffe7544a6f4a14fe968615d4481594 (patch) | |
| tree | 4cd9a96740503231b3e19b8af5164d817eb23485 /src | |
| parent | a1603e2f6b432f5f32a3b735eafdfda571fd56fb (diff) | |
| parent | 044ae60c8c0da7dc1a6b667b657d342aa770c42b (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_editor.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index a97562b98..a19d2fff1 100644 --- 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); } } |