X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;fp=src%2Fwx%2Fvideo_panel.cc;h=533545f64406932be8cc00737646f1d8f9c7d2cf;hp=eb45d4bc81a0b82ec38c35e342866c1da0cb7432;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=a4c19a34244aeaf183c25878933b570fc5c0ee34

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index eb45d4bc8..533545f64 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -240,12 +240,11 @@ VideoPanel::film_content_changed (int property)
 		_colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
 	} else if (property == FFmpegContentProperty::FILTERS) {
 		if (fcs) {
-			pair<string, string> p = Filter::ffmpeg_strings (fcs->filters ());
-			if (p.first.empty () && p.second.empty ()) {
+			string const p = Filter::ffmpeg_string (fcs->filters ());
+			if (p.empty ()) {
 				_filters->SetLabel (_("None"));
 			} else {
-				string const b = p.first + " " + p.second;
-				_filters->SetLabel (std_to_wx (b));
+				_filters->SetLabel (std_to_wx (p));
 			}
 		}
 	}
@@ -305,8 +304,8 @@ VideoPanel::setup_description ()
 		++lines;
 	}
 
-	dcp::Size const container_size = fit_ratio_within (_editor->film()->container()->ratio (), _editor->film()->full_frame ());
-	dcp::Size const scaled = vcs->scale().size (vcs, container_size);
+	dcp::Size const container_size = _editor->film()->frame_size ();
+	dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size);
 
 	if (scaled != vcs->video_size_after_crop ()) {
 		d << wxString::Format (