Hand-apply 1b68e4de5260a08e7f06a1b802cfc7eb41cd4be8 from master.

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a528dd827..5d0338bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
+	* Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
+	ellipsize filters strings if it is long.
+
 	* Hand-apply 24ae3a8f0a68529b50c34079e643caf6b9327523 from master;
 	use the number of mapped audio channels for the DCP name, not the
 	number of DCP channels (#479).
diff --git a/TO_PORT b/TO_PORT
index e58362d86..fd587ce41 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,3 +1,2 @@
-83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb
 c0e0b90d987af2586323d4a67bd67330256da51d
 69866d9ba972d21375081c313ac245535ac55be9
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index cdd2eb5de..67c369de2 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -262,10 +262,13 @@ VideoPanel::film_content_changed (int property)
 		}
 	} else if (property == FFmpegContentProperty::FILTERS) {
 		if (fcs) {
-			string const p = Filter::ffmpeg_string (fcs->filters ());
+			string p = Filter::ffmpeg_string (fcs->filters ());
 			if (p.empty ()) {
 				_filters->SetLabel (_("None"));
 			} else {
+				if (p.length() > 25) {
+					p = p.substr (0, 25) + "...";
+				}
 				_filters->SetLabel (std_to_wx (p));
 			}
 		}