diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-06 00:01:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-06 00:01:32 +0000 |
| commit | bb911c462ab6e04d399bfc68c2d331b0d4e9ef97 (patch) | |
| tree | 50ba1824e809c367e8c9da4074c8bf7755c06f06 /src/wx | |
| parent | d759f6003067e8376899b50e5692b2bbb4e870cc (diff) | |
| parent | a60428e8a618c648fccab0d9c115f1d2a3dea2d2 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/controls.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 62f75fde3..8b2a17b09 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -667,7 +667,7 @@ Controls::update_content_directory () shared_ptr<Content> content; if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) { content.reset (new DCPContent(_film, *i)); - } else if (i->path().extension() == ".mp4") { + } else if (i->path().extension() == ".mp4" || i->path().extension() == ".ecinema") { content = content_factory(_film, *i).front(); } |