Merge master and multifarious hackery.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index d08afe7a472912f0c7e86420996ec85a51c9d25e..4b1fb442e12ba802e42eb32a70affcd81dfd68c6 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -135,7 +135,6 @@ FilmViewer::film_changed (Film::Property p)
                _panel->Update ();
                break;
        case Film::SCALER:
-       case Film::FILTERS:
                update_from_decoder ();
                break;
        default:
@@ -301,15 +300,8 @@ FilmViewer::raw_to_display ()
                return;
        }
 
-       shared_ptr<const Image> input = _raw_frame;
-
-       pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
-       if (!s.second.empty ()) {
-               input = input->post_process (s.second, true);
-       }
-       
        /* Get a compacted image as we have to feed it to wxWidgets */
-       _display_frame = input->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
+       _display_frame = _raw_frame->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
 
        if (_raw_sub) {