Merge master.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 33af202bc7164c31efd650fd8c854ad30b697f16..e517c9ccaf55c2cc79c293b7a8211bbc3453271a 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -150,9 +150,9 @@ FilmViewer::get (DCPTime p, bool accurate)
                return;
        }
 
-       shared_ptr<DCPVideo> dcp_video = _player->get_video (p, accurate);
-       if (dcp_video) {
-               _frame = dcp_video->image (PIX_FMT_BGRA, true);
+       list<shared_ptr<DCPVideo> > dcp_video = _player->get_video (p, accurate);
+       if (!dcp_video.empty ()) {
+               _frame = dcp_video.front()->image (PIX_FMT_BGRA, true);
                _frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
        } else {
                _frame.reset ();