summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-25 03:18:30 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-25 03:18:30 +0100
commitd3bd799b42c0a29b415c2a37f6dd8196a97ee541 (patch)
tree087ae8a5af3e8e76e41e60dcb2daa89e2f80a1b8
parent3dd54ab58a1744c017a062305653e2e90811f04c (diff)
aaae1b20f7029d0a9a66d6f45a285fab23ecf621 from master; add container name to the video scaling/padding summary.
-rw-r--r--TO_PORT1
-rw-r--r--src/lib/video_content.cc3
2 files changed, 2 insertions, 2 deletions
diff --git a/TO_PORT b/TO_PORT
index 383230e8c..bb6fef4e1 100644
--- 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 891ccecd8..9f3d78291 100644
--- 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
);