aaae1b20f7029d0a9a66d6f45a285fab23ecf621 from master; add container name to the video...

diff --git a/TO_PORT b/TO_PORT
index 383230e8ce5364d207a267636a8b17d1617ab740..bb6fef4e170b3bc90ab12126023d865a22818caf 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-8e5f3e2d989a119f41ba4c69434545c0929e92e0
 468a7437c8ec82a8f74ae30197a2c5b04100b75d
 2bf46f7c75c59e4cd3d91f1ddd322bdabb19b6f4
 f952568be9c4438d5b024c133b18b2590de968e7

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 891ccecd859e9811c8c8df1295b59a75443d8c1e..9f3d7829163b7e05deeb48e268b27fec3e801e22 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -550,7 +550,8 @@ VideoContent::processing_description () const
        
        if (scaled != container_size) {
                d << String::compose (
-                       _("Padded with black to %1x%2"),
+                       _("Padded with black to fit container %1 (%2x%3)"),
+                       film->container()->nickname (),
                        container_size.width, container_size.height
                        );