Merge master.

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index cd831baed7cbc5b97324d97a1a603773d0ee0614..a5d197c2a15324e81b32e557ed8d45ad0a889931 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -363,18 +363,19 @@ VideoPanel::edit_colour_conversion_clicked ()
 void
 VideoPanel::content_selection_changed ()
 {
-       VideoContentList sel = _parent->selected_video ();
-       bool const single = sel.size() == 1;
-
-       _left_crop->set_content (sel);
-       _right_crop->set_content (sel);
-       _top_crop->set_content (sel);
-       _bottom_crop->set_content (sel);
-       _frame_type->set_content (sel);
-       _scale->set_content (sel);
-
-       /* Things that are only allowed with single selections */
-       _filters_button->Enable (single);
+       VideoContentList video_sel = _parent->selected_video ();
+       FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
+       
+       bool const single = video_sel.size() == 1;
+
+       _left_crop->set_content (video_sel);
+       _right_crop->set_content (video_sel);
+       _top_crop->set_content (video_sel);
+       _bottom_crop->set_content (video_sel);
+       _frame_type->set_content (video_sel);
+       _scale->set_content (video_sel);
+
+       _filters_button->Enable (single && !ffmpeg_sel.empty ());
        _colour_conversion_button->Enable (single);
 
        film_content_changed (VideoContentProperty::VIDEO_CROP);